Repository: aurora-packaging Updated Branches: refs/heads/master 02a9b24f4 -> 885815792
Update packages for post 0.9.0 changes. Bugs closed: AURORA-851 Reviewed at https://reviews.apache.org/r/37764/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/88581579 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/88581579 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/88581579 Branch: refs/heads/master Commit: 885815792080e766794b1e291102dd516868a1e7 Parents: 02a9b24 Author: Bill Farner <[email protected]> Authored: Tue Aug 25 10:43:45 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Tue Aug 25 10:44:08 2015 -0700 ---------------------------------------------------------------------- builder/deb/ubuntu-trusty/Dockerfile | 6 +++--- specs/debian/control | 2 +- specs/debian/rules | 8 ++++---- specs/rpm/aurora.spec | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/88581579/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index 73f150b..a827c7a 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -40,12 +40,12 @@ RUN curl -O http://people.apache.org/~jfarrell/thrift/0.9.1/contrib/deb/ubuntu/1 && dpkg --install $THRIFT_DEB \ && rm $THRIFT_DEB -# Install gradle 2.5. +# Install gradle. RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ && apt-get install -y ruby ruby-dev unzip wget \ - && gem install fpm && ./gradle-mkdeb.sh 2.5 \ - && dpkg -i gradle-2.5_2.5-2_all.deb \ + && gem install fpm && ./gradle-mkdeb.sh 2.6 \ + && dpkg -i gradle-2.6_2.6-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/88581579/specs/debian/control ---------------------------------------------------------------------- diff --git a/specs/debian/control b/specs/debian/control index 3ece202..b286517 100644 --- a/specs/debian/control +++ b/specs/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: The Apache Aurora authors <[email protected]> Build-Depends: debhelper (>= 9), java8-sdk | openjdk-8-jdk, - gradle (>= 2.5) | gradle-2.5, + gradle (>= 2.6) | gradle-2.6, python-all-dev, libkrb5-dev, curl, http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/88581579/specs/debian/rules ---------------------------------------------------------------------- diff --git a/specs/debian/rules b/specs/debian/rules index ef35a04..832420c 100755 --- a/specs/debian/rules +++ b/specs/debian/rules @@ -31,12 +31,12 @@ __gradle_build: __pants_build: mkdir -p third_party - $(pants) binary src/main/python/apache/aurora/executor/bin:thermos_executor - $(pants) binary src/main/python/apache/aurora/client/cli:kaurora - $(pants) binary src/main/python/apache/aurora/admin:kaurora_admin + $(pants) binary src/main/python/apache/aurora/executor:thermos_executor + $(pants) binary src/main/python/apache/aurora/kerberos:kaurora + $(pants) binary src/main/python/apache/aurora/kerberos:kaurora_admin $(pants) binary src/main/python/apache/aurora/tools:thermos $(pants) binary src/main/python/apache/aurora/tools:thermos_observer - $(pants) binary src/main/python/apache/thermos/bin:thermos_runner + $(pants) binary src/main/python/apache/thermos/runner:thermos_runner build-support/embed_runner_in_executor.py override_dh_installinit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/88581579/specs/rpm/aurora.spec ---------------------------------------------------------------------- diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec index e6fca4e..22c107e 100644 --- a/specs/rpm/aurora.spec +++ b/specs/rpm/aurora.spec @@ -30,7 +30,7 @@ %endif %if %{?!GRADLE_VERSION:1}0 -%global GRADLE_VERSION 2.5 +%global GRADLE_VERSION 2.6 %endif %if %{?!JAVA_VERSION:!}0 @@ -38,7 +38,7 @@ %endif %if %{?!MESOS_VERSION:1}0 -%global MESOS_VERSION 0.22.0 +%global MESOS_VERSION 0.23.0 %endif %if %{?!PEX_BINARIES:1}0 @@ -167,16 +167,16 @@ unzip gradle-%{GRADLE_VERSION}-bin.zip export PANTS_CONFIG_OVERRIDE=/pants.ini # Builds Aurora client PEX binaries. -./pants binary src/main/python/apache/aurora/client/cli:kaurora +./pants binary src/main/python/apache/aurora/kerberos:kaurora mv dist/kaurora.pex dist/aurora.pex -./pants binary src/main/python/apache/aurora/admin:kaurora_admin +./pants binary src/main/python/apache/aurora/kerberos:kaurora_admin mv dist/kaurora_admin.pex dist/aurora_admin.pex # Builds Aurora Thermos and GC executor PEX binaries. -./pants binary src/main/python/apache/aurora/executor/bin:thermos_executor +./pants binary src/main/python/apache/aurora/executor:thermos_executor ./pants binary src/main/python/apache/aurora/tools:thermos -./pants binary src/main/python/apache/thermos/bin:thermos_runner ./pants binary src/main/python/apache/aurora/tools:thermos_observer +./pants binary src/main/python/apache/thermos/runner:thermos_runner # Packages the Thermos runner within the Thermos executor. build-support/embed_runner_in_executor.py
