Repository: aurora-packaging Updated Branches: refs/heads/master 661280a7d -> f8ea8f288
Updating aurora-packaging for compatibility with Pants 1.6.0 and to reflect Mesos 1.5.0 change * Upgrading Trusty Box with python2.7 version that is has hmac.compare_digest support. * Upgradinb Virtualenv to 16.0.0 * Upgrading to Mesos 1.5.0 on all test boxes. * Upgrading Centos 7 box from 7.4 to 7.5 * Migrating from deprecated Pants --config-override to --config-files as per https://github.com/pantsbuild/pants/commit/e0d5108ff75a41421a11321c73c817332f0a1c86 Reviewed at https://reviews.apache.org/r/68078/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/f8ea8f28 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/f8ea8f28 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/f8ea8f28 Branch: refs/heads/master Commit: f8ea8f2887f9b31539f66fb16346e4c3485d28e0 Parents: 661280a Author: Renan DelValle <[email protected]> Authored: Fri Jul 27 07:58:54 2018 -0700 Committer: Renan <[email protected]> Committed: Fri Jul 27 07:58:54 2018 -0700 ---------------------------------------------------------------------- build-support/virtualenv | 2 +- builder/deb/ubuntu-trusty/Dockerfile | 2 ++ specs/debian/control | 2 +- specs/debian/rules | 4 ++-- specs/rpm/aurora.spec | 6 +++--- test/deb/debian-jessie/provision.sh | 2 +- test/deb/ubuntu-trusty/provision.sh | 5 +++-- test/deb/ubuntu-xenial/provision.sh | 2 +- test/rpm/centos-7/Vagrantfile | 2 +- test/rpm/centos-7/provision.sh | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/build-support/virtualenv ---------------------------------------------------------------------- diff --git a/build-support/virtualenv b/build-support/virtualenv index d6484f5..a197f36 100755 --- a/build-support/virtualenv +++ b/build-support/virtualenv @@ -14,7 +14,7 @@ # # Wrapper for self-bootstrapping virtualenv set -ex -VIRTUALENV_VERSION=15.1.0 +VIRTUALENV_VERSION=16.0.0 if which python2.7 >/dev/null; then PY=`which python2.7` http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index b2b32c6..342e655 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -33,8 +33,10 @@ RUN apt-get update && apt-get -y install \ 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. http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/specs/debian/control ---------------------------------------------------------------------- diff --git a/specs/debian/control b/specs/debian/control index 83b20b6..c7c5d76 100644 --- a/specs/debian/control +++ b/specs/debian/control @@ -20,7 +20,7 @@ Section: net Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, openjdk-8-jre-headless | java8-runtime-headless, - mesos (>= 1.4.0) + mesos (>= 1.5.0) Recommends: aurora-tools Suggests: aurora-doc Description: Apache Aurora scheduler http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/specs/debian/rules ---------------------------------------------------------------------- diff --git a/specs/debian/rules b/specs/debian/rules index 8e338b8..4ad09ae 100755 --- a/specs/debian/rules +++ b/specs/debian/rules @@ -23,8 +23,8 @@ TMP = $(CURDIR)/debian gradle = $(shell which gradle) pants = $(CURDIR)/pants -PANTS_CONFIG_OVERRIDE = ["$(CURDIR)/debian/aurora-pants.ini"] -export PANTS_CONFIG_OVERRIDE +PANTS_CONFIG_FILES = $(CURDIR)/debian/aurora-pants.ini +export PANTS_CONFIG_FILES override_dh_auto_build: __gradle_build __pants_build http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/specs/rpm/aurora.spec ---------------------------------------------------------------------- diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec index 035f049..f03b6aa 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.19.0 +%global AURORA_VERSION 0.21.0 %endif %if %{?!AURORA_INTERNAL_VERSION:1}0 @@ -42,7 +42,7 @@ %endif %if %{?!MESOS_VERSION:1}0 -%global MESOS_VERSION 1.4.0 +%global MESOS_VERSION 1.5.0 %endif %if %{?!PEX_BINARIES:1}0 @@ -178,7 +178,7 @@ unzip gradle-%{GRADLE_VERSION}-bin.zip # This avoids building mesos to produce them. %{__mkdir_p} %{buildroot} %{__cp} %{SOURCE12} %{buildroot} -export PANTS_CONFIG_OVERRIDE="['%{buildroot}/aurora-pants.ini']" +export PANTS_CONFIG_FILES="%{buildroot}/aurora-pants.ini" # Builds Aurora client PEX binaries. ./pants binary src/main/python/apache/aurora/kerberos:kaurora http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/test/deb/debian-jessie/provision.sh ---------------------------------------------------------------------- diff --git a/test/deb/debian-jessie/provision.sh b/test/deb/debian-jessie/provision.sh index e381613..2831fe7 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.4.0-2.0.1.debian8_amd64.deb +package=mesos_1.5.0-2.0.2.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/f8ea8f28/test/deb/ubuntu-trusty/provision.sh ---------------------------------------------------------------------- diff --git a/test/deb/ubuntu-trusty/provision.sh b/test/deb/ubuntu-trusty/provision.sh index 1a62288..7b9141a 100644 --- a/test/deb/ubuntu-trusty/provision.sh +++ b/test/deb/ubuntu-trusty/provision.sh @@ -2,8 +2,9 @@ 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 +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 @@ -11,7 +12,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.4.0-2.0.1.ubuntu1404_amd64.deb +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 http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/test/deb/ubuntu-xenial/provision.sh ---------------------------------------------------------------------- diff --git a/test/deb/ubuntu-xenial/provision.sh b/test/deb/ubuntu-xenial/provision.sh index c55af0c..4023d18 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.4.0-2.0.1.ubuntu1604_amd64.deb +package=mesos_1.5.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/f8ea8f28/test/rpm/centos-7/Vagrantfile ---------------------------------------------------------------------- diff --git a/test/rpm/centos-7/Vagrantfile b/test/rpm/centos-7/Vagrantfile index bea36d1..24d4d26 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.4" + config.vm.box = "bento/centos-7.5" config.vm.hostname = "localhost" http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/f8ea8f28/test/rpm/centos-7/provision.sh ---------------------------------------------------------------------- diff --git a/test/rpm/centos-7/provision.sh b/test/rpm/centos-7/provision.sh index 1039376..0d220d7 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.4.0 +yum -y install mesos-1.5.0 systemctl start mesos-master systemctl start mesos-slave
