Repository: aurora-packaging Updated Branches: refs/heads/master 815a9ac04 -> 7c1732f68
Update Thrift binary to point at new repository location for builds. Remove documentation pointing to non-existing YUM repo and use local builds in instructions. Bugs closed: AURORA-1626 Reviewed at https://reviews.apache.org/r/44277/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/7c1732f6 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/7c1732f6 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/7c1732f6 Branch: refs/heads/master Commit: 7c1732f688631cebb76579c03678b08cef7828bf Parents: 815a9ac Author: Martin Hrabovcin <[email protected]> Authored: Wed Mar 2 16:47:40 2016 -0800 Committer: Bill Farner <[email protected]> Committed: Wed Mar 2 16:47:40 2016 -0800 ---------------------------------------------------------------------- builder/deb/ubuntu-trusty/Dockerfile | 10 +++++----- test/rpm/centos-7/README.md | 14 +++++++------- test/rpm/centos-7/Vagrantfile | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/7c1732f6/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index f9a4004..5273910 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -15,8 +15,6 @@ FROM ubuntu:trusty WORKDIR /aurora ENV HOME /aurora ENV DEBIAN_FRONTEND noninteractive -# TODO(wfarner): Provide external parameterization via env vars for versions. -ENV THRIFT_DEB thrift-compiler_0.9.1_amd64.deb RUN apt-get update && apt-get -y install \ bison \ @@ -36,9 +34,11 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y \ && apt-get install -y openjdk-8-jdk \ && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -RUN curl -O http://people.apache.org/~jfarrell/thrift/0.9.1/contrib/deb/ubuntu/12.04/$THRIFT_DEB \ - && dpkg --install $THRIFT_DEB \ - && rm $THRIFT_DEB +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 install thrift-compiler=0.9.1 # Install gradle. RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/7c1732f6/test/rpm/centos-7/README.md ---------------------------------------------------------------------- diff --git a/test/rpm/centos-7/README.md b/test/rpm/centos-7/README.md index 979c00b..684a3b5 100644 --- a/test/rpm/centos-7/README.md +++ b/test/rpm/centos-7/README.md @@ -1,16 +1,16 @@ # Installing Aurora ## Install packages -### Point to wfarner's test yum repo - echo '[apache-aurora-wfarner] - name=Apache Aurora distribution maintained by wfarner - baseurl=http://people.apache.org/~wfarner/aurora/distributions/0.9.0/rpm/centos-7/x86_64/ - gpgcheck = 0' | sudo tee /etc/yum.repos.d/apache-aurora-wfarner.repo > /dev/null +# Within vagrant install vagrant scp +vagrant plugin install vagrant-scp -## Install +# Then scp over the newly built packages +vagrant scp \ + ~/aurora-packaging/artifacts/aurora-centos-7/dist/rpmbuild/SRPMS/aurora-scheduler-0.12.0-1.el7.centos.aurora.src.rpm \ + aurora_centos_7:aurora-scheduler-0.12.0-1.el7.centos.aurora.src.rpm - sudo yum install -y aurora aurora-client aurora-thermos +# Install each rpm via rpm âivh aurora-scheduler-0.12.0-1.el7.centos.aurora.src.rpm ### Initialize and start http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/7c1732f6/test/rpm/centos-7/Vagrantfile ---------------------------------------------------------------------- diff --git a/test/rpm/centos-7/Vagrantfile b/test/rpm/centos-7/Vagrantfile index 4d34b66..1a64166 100644 --- a/test/rpm/centos-7/Vagrantfile +++ b/test/rpm/centos-7/Vagrantfile @@ -7,5 +7,6 @@ Vagrant.configure(2) do |config| vb.customize ["modifyvm", :id, "--memory", "4096"] vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] end + config.vm.define "aurora_centos_7" config.vm.provision "shell", path: "provision.sh" end
