Dropping support for Ubuntu Trusty packages as Trusty is EOL (#14)
* Trust packages are broken for 0.22.0 and Trusty has reached EOL.
diff --git a/README.md b/README.md
index cdc7a27..92b96b9 100644
--- a/README.md
+++ b/README.md
@@ -17,13 +17,13 @@
2. Run the builder script, providing the distribution platform and the source
distribution archive you downloaded in (1). The example below will build
- Aurora 0.9.0 debs for Ubuntu Trusty.
+ Aurora 0.22.0 debs for Ubuntu Xenial.
- ./build-artifact.sh builder/deb/ubuntu-trusty \
- ../apache-aurora-0.9.0.tar.gz \
- 0.9.0
+ ./build-artifact.sh builder/deb/ubuntu-xenial \
+ ../apache-aurora-0.22.0.tar.gz \
+ 0.22.0
-When this completes, debs will be placed in `artifacts/aurora-ubuntu-trusty/dist/`.
+When this completes, debs will be placed in `artifacts/aurora-ubuntu-xenial/dist/`.
### Creating a release candidate
@@ -49,11 +49,11 @@
./build-support/release/release-candidate
Signing artifacts for centos-7...
- Created archive for centos-7 artifacts at /home/jsirois/dev/aurora/jsirois-aurora-packaging/artifacts/aurora-centos-7/dist/rpmbuild/RPMS/upload.tar.
+ Created archive for centos-7 artifacts at aurora-packaging/artifacts/aurora-centos-7/dist/rpmbuild/RPMS/upload.tar.
Signing artifacts for debian-jessie...
- Created archive for debian-jessie artifacts at /home/jsirois/dev/aurora/jsirois-aurora-packaging/artifacts/aurora-debian-jessie/upload.tar.
- Signing artifacts for ubuntu-trusty...
- Created archive for ubuntu-trusty artifacts at /home/jsirois/dev/aurora/jsirois-aurora-packaging/artifacts/aurora-ubuntu-trusty/upload.tar.
+ Created archive for debian-jessie artifacts at aurora-packaging/artifacts/aurora-debian-jessie/upload.tar.
+ Signing artifacts for ubuntu-xenial...
+ Created archive for ubuntu-xenial artifacts at aurora-packaging/artifacts/aurora-ubuntu-xenial/upload.tar.
All artifacts prepared for upload to bintray.
In the bintray UI, create a new version in your release-candidate repo, for example '0.12.0'. Then,
diff --git a/build-support/release/release-candidate b/build-support/release/release-candidate
index 133e56c..c5a8fa2 100755
--- a/build-support/release/release-candidate
+++ b/build-support/release/release-candidate
@@ -19,7 +19,6 @@
cd "${ROOT_DIR}"
declare -A DIST_DIRS=(
- ["ubuntu-trusty"]="${ROOT_DIR}/artifacts/aurora-ubuntu-trusty/dist"
["ubuntu-xenial"]="${ROOT_DIR}/artifacts/aurora-ubuntu-xenial/dist"
["debian-jessie"]="${ROOT_DIR}/artifacts/aurora-debian-jessie/dist"
["centos-7"]="${ROOT_DIR}/artifacts/aurora-centos-7/dist/rpmbuild/RPMS/x86_64"
diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile
deleted file mode 100644
index 342e655..0000000
--- a/builder/deb/ubuntu-trusty/Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-FROM ubuntu:trusty
-
-WORKDIR /aurora
-ENV HOME /aurora
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && apt-get -y install \
- bison \
- ca-certificates-java \
- debhelper \
- dh-systemd \
- devscripts \
- dpkg-dev \
- curl \
- git \
- libapr1-dev \
- libcurl4-openssl-dev \
- libffi-dev \
- libsvn-dev \
- python-all-dev \
- software-properties-common
-
-RUN add-apt-repository -y ppa:openjdk-r/ppa \
- && add-apt-repository -y ppa:jonathonf/python-2.7 \
- && apt-get update \
- && apt-get -y install openjdk-8-jdk \
- && apt-get -y install --no-install-recommends python2.7-minimal \
- && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-
-# Install gradle.
-RUN git clone --depth 1 https://github.com/benley/gradle-packaging \
- && cd gradle-packaging \
- && apt-get -y install ruby ruby-dev unzip wget \
- && gem install fpm && ./gradle-mkdeb.sh 4.2 \
- && apt-get -y install gdebi-core \
- && gdebi --non-interactive gradle-4.2_4.2-2_all.deb \
- && cd .. && rm -rf gradle-packaging
-
-ADD build.sh /build.sh
diff --git a/builder/deb/ubuntu-trusty/build.sh b/builder/deb/ubuntu-trusty/build.sh
deleted file mode 100755
index 04f4cb1..0000000
--- a/builder/deb/ubuntu-trusty/build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -ex
-
-mkdir /scratch
-cd /scratch
-
-tar --strip-components 1 -C . -xf /src.tar.gz
-
-cp -R /specs/debian .
-
-DISTRO=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
-CODENAME=$(lsb_release -cs | tr '[:upper:]' '[:lower:]')
-THIRD_PARTY_REPO="https://svn.apache.org/repos/asf/aurora/3rdparty/"
-THIRD_PARTY_REPO+="${DISTRO}/${CODENAME}64/python/"
-
-# Place the link to the correct python egg into aurora-pants.ini
-echo "[python-repos]" >> ./debian/aurora-pants.ini
-echo "repos: ['third_party/', '${THIRD_PARTY_REPO}']" >> ./debian/aurora-pants.ini
-
-export DEBFULLNAME='Apache Aurora'
-export DEBEMAIL='dev@aurora.apache.org'
-
-dch \
- --newversion $AURORA_VERSION \
- --package apache-aurora \
- --urgency medium \
- "Apache Aurora package builder <dev@aurora.apache.org> $(date -R)"
-dch --release ''
-
-dpkg-buildpackage -uc -b -tc
-
-mkdir /dist
-mv ../*.deb /dist
diff --git a/test/deb/ubuntu-trusty/README.md b/test/deb/ubuntu-trusty/README.md
deleted file mode 100644
index 61cfeda..0000000
--- a/test/deb/ubuntu-trusty/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Installing Aurora
-
-## Testing packages
-
-Two methods are described, one for installing locally built packages, the other
-for installing released packages or release candidate packages.
-
-
-### Locally built
-
-Run this from the toplevel repository:
-
- ./test/test-artifact.sh test/deb/ubuntu-trusty /repo/artifacts/aurora-ubuntu-trusty/dist
-
-
-### Released
-
-Run this from the toplevel repository:
-
- version=0.17.0
- pkg_root="https://apache.bintray.com/aurora/ubuntu-trusty/"
-
- for deb in \
- aurora-scheduler_${version}_amd64.deb \
- aurora-executor_${version}_amd64.deb \
- aurora-tools_${version}_amd64.deb; do
-
- wget $pkg_root/$deb -P artifacts/aurora-ubuntu-trusty/${version}
- done
-
- ./test/test-artifact.sh test/deb/ubuntu-trusty /repo/artifacts/aurora-ubuntu-trusty/${version}
-
-
-## Troubleshooting
-
-* Mesos: `/var/log/mesos`
-* Aurora scheduler: `/var/log/upstart/aurora-scheduler.log`
-* Aurora observer: `/var/log/upstart/thermos.log`
diff --git a/test/deb/ubuntu-trusty/Vagrantfile b/test/deb/ubuntu-trusty/Vagrantfile
deleted file mode 100644
index f050ef2..0000000
--- a/test/deb/ubuntu-trusty/Vagrantfile
+++ /dev/null
@@ -1,17 +0,0 @@
-Vagrant.require_version ">= 1.5.0"
-
-Vagrant.configure(2) do |config|
- config.vm.define "aurora_trusty"
- config.vm.box = "ubuntu/trusty64"
-
- config.vm.hostname = "localhost"
-
- # Mount the entire aurora-packaging folder at /repo
- config.vm.synced_folder "../../../", "/repo"
-
- config.vm.provider :virtualbox do |vb|
- vb.customize ["modifyvm", :id, "--memory", "4096"]
- vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
- end
- config.vm.provision "shell", path: "provision.sh"
-end
diff --git a/test/deb/ubuntu-trusty/install-aurora.sh b/test/deb/ubuntu-trusty/install-aurora.sh
deleted file mode 100755
index ecff474..0000000
--- a/test/deb/ubuntu-trusty/install-aurora.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-DIST_DIR=$1
-PACKAGES=$(ls $DIST_DIR/*.deb)
-
-if [ -z "$PACKAGES" ]
- then
- echo "No packages found to be installed. Aborting."
- exit 1
-fi
-
-sudo dpkg -i $PACKAGES
-
-sudo stop aurora-scheduler
-sudo -u aurora mkdir -p /var/lib/aurora/scheduler/db
-sudo -u aurora mesos-log initialize --path=/var/lib/aurora/scheduler/db || true
-sudo start aurora-scheduler
diff --git a/test/deb/ubuntu-trusty/provision.sh b/test/deb/ubuntu-trusty/provision.sh
deleted file mode 100644
index 7b9141a..0000000
--- a/test/deb/ubuntu-trusty/provision.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-apt-get install --reinstall ca-certificates
-add-apt-repository ppa:openjdk-r/ppa -y
-add-apt-repository -y ppa:jonathonf/python-2.7
-apt-get update
-apt-get install -y openjdk-8-jre zookeeperd python2.7-minimal
-
-update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-
-# NOTE: This appears to be a missing dependency of the mesos deb package and is needed
-# for the python mesos native bindings.
-sudo apt-get -y install libcurl4-nss-dev libevent-dev libsvn1
-
-package=mesos_1.5.0-2.0.2.ubuntu1404_amd64.deb
-wget -c http://repos.mesosphere.com/ubuntu/pool/main/m/mesos/$package
-dpkg -i $package
-
-start mesos-master
-start mesos-slave
diff --git a/test/test-artifact.sh b/test/test-artifact.sh
index 6b527c9..a7290db 100755
--- a/test/test-artifact.sh
+++ b/test/test-artifact.sh
@@ -44,7 +44,7 @@
echo ' and where DIST_DIR is location within the Vagrant box where packages should be installed from.'
echo
echo 'Example:'
- echo ' ./test/test-artifact.sh test/deb/ubuntu-trusty/ /repo/artifacts/aurora-ubuntu-trusty/dist'
+ echo ' ./test/test-artifact.sh test/deb/ubuntu-xenial/ /repo/artifacts/aurora-ubuntu-xenial/dist'
exit 1
;;
esac
