Repository: aurora-packaging Updated Branches: refs/heads/master de2ad96bd -> 9f82912ec
Update packaging to latest Thrift, Mesos, and virtualenv * Remove the hardwired Thrift build dependency from the RPM and DEB packages. With the update to Thrift 0.10 and pants 1.4.0.dev23, the pants build script will download an appropriate Thrift compiler automatically. * Add missing system dependencies missing by the latest pants version. * Use latest virtualenv script from the main Aurora repo Reviewed at https://reviews.apache.org/r/64825/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/9f82912e Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/9f82912e Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/9f82912e Branch: refs/heads/master Commit: 9f82912ecd576c71b0b1b8c03ad54d44acbcf684 Parents: de2ad96 Author: Stephan Erb <[email protected]> Authored: Wed Jan 10 20:59:54 2018 +0100 Committer: Stephan Erb <[email protected]> Committed: Wed Jan 10 20:59:54 2018 +0100 ---------------------------------------------------------------------- build-support/virtualenv | 7 +++---- builder/deb/debian-jessie/Dockerfile | 4 ++-- builder/deb/ubuntu-trusty/Dockerfile | 6 ------ builder/deb/ubuntu-xenial/Dockerfile | 7 +------ builder/rpm/centos-7/Dockerfile | 1 + specs/debian/control | 6 ++---- specs/rpm/aurora.spec | 4 ++-- test/deb/debian-jessie/provision.sh | 2 +- test/deb/ubuntu-trusty/provision.sh | 2 +- test/deb/ubuntu-xenial/provision.sh | 2 +- test/rpm/centos-7/Vagrantfile | 2 +- test/rpm/centos-7/provision.sh | 2 +- 12 files changed, 16 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/build-support/virtualenv ---------------------------------------------------------------------- diff --git a/build-support/virtualenv b/build-support/virtualenv index 3ed5b8c..d6484f5 100755 --- a/build-support/virtualenv +++ b/build-support/virtualenv @@ -14,7 +14,7 @@ # # Wrapper for self-bootstrapping virtualenv set -ex -VIRTUALENV_VERSION=14.0.6 +VIRTUALENV_VERSION=15.1.0 if which python2.7 >/dev/null; then PY=`which python2.7` @@ -28,11 +28,10 @@ echo "Using $PY" >&2 HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd) if ! [ -f "$HERE/virtualenv-$VIRTUALENV_VERSION/BOOTSTRAPPED" ]; then pushd "$HERE" - curl -O https://pypi.python.org/packages/source/v/virtualenv/virtualenv-$VIRTUALENV_VERSION.tar.gz + curl -LO https://pypi.io/packages/source/v/virtualenv/virtualenv-$VIRTUALENV_VERSION.tar.gz tar zxvf virtualenv-$VIRTUALENV_VERSION.tar.gz - # TODO(ksweeney): Checksum touch virtualenv-$VIRTUALENV_VERSION/BOOTSTRAPPED # 2PC popd fi -exec "$PY" "$HERE/virtualenv-$VIRTUALENV_VERSION/virtualenv.py" "$@" +exec "$PY" "$HERE/virtualenv-$VIRTUALENV_VERSION/virtualenv.py" --no-download "$@" http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/builder/deb/debian-jessie/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/debian-jessie/Dockerfile b/builder/deb/debian-jessie/Dockerfile index 1983fb6..6cba239 100644 --- a/builder/deb/debian-jessie/Dockerfile +++ b/builder/deb/debian-jessie/Dockerfile @@ -37,10 +37,10 @@ RUN apt-get update && apt-get -y install \ libcurl4-openssl-dev \ libffi-dev \ libkrb5-dev \ + libssl-dev \ libsvn-dev \ python-all-dev \ - software-properties-common \ - thrift-compiler + software-properties-common RUN apt-get -y -t jessie-backports install openjdk-8-jdk \ && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index 99c5481..b2b32c6 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -37,12 +37,6 @@ RUN add-apt-repository -y ppa:openjdk-r/ppa \ && apt-get -y install openjdk-8-jdk \ && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -RUN curl -sSL http://apache.org/dist/thrift/KEYS | gpg --import - && \ - gpg --export --armor 66B778F9 | sudo apt-key add - && \ - echo 'deb http://www.apache.org/dist/thrift/debian 0.9.1 main' > /etc/apt/sources.list.d/thrift.list && \ - apt-get update && \ - apt-get -y install thrift-compiler=0.9.1 - # Install gradle. RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/builder/deb/ubuntu-xenial/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-xenial/Dockerfile b/builder/deb/ubuntu-xenial/Dockerfile index dfdce15..9150ce8 100644 --- a/builder/deb/ubuntu-xenial/Dockerfile +++ b/builder/deb/ubuntu-xenial/Dockerfile @@ -28,6 +28,7 @@ RUN apt-get update && apt-get -y install \ gcc-4.8 \ libapr1-dev \ libcurl4-openssl-dev \ + libssl-dev \ libsvn-dev \ libffi-dev \ python-all-dev \ @@ -37,12 +38,6 @@ RUN apt-get update && apt-get -y install \ RUN apt-get -y install openjdk-8-jdk \ && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -RUN curl -sSL http://apache.org/dist/thrift/KEYS | gpg --import - && \ - gpg --export --armor 66B778F9 | apt-key add - && \ - echo 'deb http://www.apache.org/dist/thrift/debian 0.9.1 main' > /etc/apt/sources.list.d/thrift.list && \ - apt-get update && \ - apt-get -y install thrift-compiler=0.9.1 - # Install gradle. RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/builder/rpm/centos-7/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/rpm/centos-7/Dockerfile b/builder/rpm/centos-7/Dockerfile index c12a61f..9397b4a 100644 --- a/builder/rpm/centos-7/Dockerfile +++ b/builder/rpm/centos-7/Dockerfile @@ -28,6 +28,7 @@ RUN yum install -y \ libcurl-devel \ libffi-devel \ openssl \ + openssl-devel \ patch \ python \ python-devel \ http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/specs/debian/control ---------------------------------------------------------------------- diff --git a/specs/debian/control b/specs/debian/control index df86306..83b20b6 100644 --- a/specs/debian/control +++ b/specs/debian/control @@ -9,9 +9,7 @@ Build-Depends: debhelper (>= 9), curl, openssl, git, - wget, - thrift-compiler (>= 0.9.1) -# thrift-compiler version needs to match the ext.thriftRev value from build.gradle + wget Section: net Standards-Version: 3.9.5 Homepage: https://aurora.apache.org @@ -22,7 +20,7 @@ Section: net Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, openjdk-8-jre-headless | java8-runtime-headless, - mesos (>= 1.2.0) + mesos (>= 1.4.0) Recommends: aurora-tools Suggests: aurora-doc Description: Apache Aurora scheduler http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/specs/rpm/aurora.spec ---------------------------------------------------------------------- diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec index e1eff9c..3103642 100644 --- a/specs/rpm/aurora.spec +++ b/specs/rpm/aurora.spec @@ -14,7 +14,7 @@ # Overridable variables; %if %{?!AURORA_VERSION:1}0 -%global AURORA_VERSION 0.18.0 +%global AURORA_VERSION 0.19.0 %endif %if %{?!AURORA_INTERNAL_VERSION:1}0 @@ -42,7 +42,7 @@ %endif %if %{?!MESOS_VERSION:1}0 -%global MESOS_VERSION 1.2.0 +%global MESOS_VERSION 1.4.0 %endif %if %{?!PEX_BINARIES:1}0 http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/test/deb/debian-jessie/provision.sh ---------------------------------------------------------------------- diff --git a/test/deb/debian-jessie/provision.sh b/test/deb/debian-jessie/provision.sh index 331a26c..e381613 100644 --- a/test/deb/debian-jessie/provision.sh +++ b/test/deb/debian-jessie/provision.sh @@ -11,7 +11,7 @@ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java # for the python mesos native bindings. aptitude -y install libcurl4-nss-dev libcurl3 libevent-dev libsvn1 -package=mesos_1.2.0-2.0.3.debian8_amd64.deb +package=mesos_1.4.0-2.0.1.debian8_amd64.deb wget -c http://repos.mesosphere.com/debian/pool/main/m/mesos/$package dpkg -i $package http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/test/deb/ubuntu-trusty/provision.sh ---------------------------------------------------------------------- diff --git a/test/deb/ubuntu-trusty/provision.sh b/test/deb/ubuntu-trusty/provision.sh index b9cbd43..2d886bf 100644 --- a/test/deb/ubuntu-trusty/provision.sh +++ b/test/deb/ubuntu-trusty/provision.sh @@ -10,7 +10,7 @@ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java # for the python mesos native bindings. sudo apt-get -y install libcurl4-nss-dev libevent-dev libsvn1 -package=mesos_1.2.0-2.0.3.ubuntu1404_amd64.deb +package=mesos_1.4.0-2.0.1.ubuntu1404_amd64.deb wget -c http://repos.mesosphere.com/ubuntu/pool/main/m/mesos/$package dpkg -i $package http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/test/deb/ubuntu-xenial/provision.sh ---------------------------------------------------------------------- diff --git a/test/deb/ubuntu-xenial/provision.sh b/test/deb/ubuntu-xenial/provision.sh index 2adb879..c55af0c 100644 --- a/test/deb/ubuntu-xenial/provision.sh +++ b/test/deb/ubuntu-xenial/provision.sh @@ -9,7 +9,7 @@ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java # Mesos dependencies apt-get -y install libcurl3 libevent-dev libsvn1 libcurl4-nss-dev -package=mesos_1.2.0-2.0.3.ubuntu1604_amd64.deb +package=mesos_1.4.0-2.0.1.ubuntu1604_amd64.deb wget -c http://repos.mesosphere.com/ubuntu/pool/main/m/mesos/$package dpkg -i $package http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/test/rpm/centos-7/Vagrantfile ---------------------------------------------------------------------- diff --git a/test/rpm/centos-7/Vagrantfile b/test/rpm/centos-7/Vagrantfile index 8342b09..bea36d1 100644 --- a/test/rpm/centos-7/Vagrantfile +++ b/test/rpm/centos-7/Vagrantfile @@ -2,7 +2,7 @@ Vagrant.require_version ">= 1.5.0" Vagrant.configure(2) do |config| config.vm.define "aurora_centos_7" - config.vm.box = "bento/centos-7.1" + config.vm.box = "bento/centos-7.4" config.vm.hostname = "localhost" http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/9f82912e/test/rpm/centos-7/provision.sh ---------------------------------------------------------------------- diff --git a/test/rpm/centos-7/provision.sh b/test/rpm/centos-7/provision.sh index f41ffd1..1039376 100644 --- a/test/rpm/centos-7/provision.sh +++ b/test/rpm/centos-7/provision.sh @@ -6,7 +6,7 @@ service zookeeper-server init systemctl start zookeeper-server rpm -Uvh https://repos.mesosphere.io/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm -yum -y install mesos-1.2.0 +yum -y install mesos-1.4.0 systemctl start mesos-master systemctl start mesos-slave
