Fixup rpm builder and tester.
This updates the mesos version from 0.23.0 to 0.25.0 and fixes
up the vagrant test environment and instructions.
NB: This change does attempt to address https://issues.apache.org/jira/browse/AURORA-1394
Bugs closed: AURORA-1568
Reviewed at https://reviews.apache.org/r/44527/
diff --git a/specs/rpm/aurora.spec b/specs/rpm/aurora.spec
index d9923b2..71ae030 100644
--- a/specs/rpm/aurora.spec
+++ b/specs/rpm/aurora.spec
@@ -38,7 +38,7 @@
%endif
%if %{?!MESOS_VERSION:1}0
-%global MESOS_VERSION 0.23.0
+%global MESOS_VERSION 0.25.0
%endif
%if %{?!PEX_BINARIES:1}0
diff --git a/test/rpm/centos-7/README.md b/test/rpm/centos-7/README.md
index 684a3b5..6a6e419 100644
--- a/test/rpm/centos-7/README.md
+++ b/test/rpm/centos-7/README.md
@@ -2,30 +2,35 @@
## Install packages
-# Within vagrant install vagrant scp
-vagrant plugin install vagrant-scp
+### Install vagrant scp
-# 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
+ vagrant plugin install vagrant-scp
-# Install each rpm via rpm –ivh aurora-scheduler-0.12.0-1.el7.centos.aurora.src.rpm
+### Then scp over the newly built packages
-### Initialize and start
+ for rpm in ../../../artifacts/aurora-centos-7/dist/rpmbuild/RPMS/x86_64/*.rpm; do
+ vagrant scp $rpm aurora_centos_7:$(basename $rpm)
+ done
+### Install each rpm
+
+ vagrant ssh -- -L8081:localhost:8081 -L1338:localhost:1338
+ sudo yum install -y *.rpm
+
+## Initialize and start
+
+ sudo -u aurora mkdir -p /var/lib/aurora/scheduler/db
sudo -u aurora mesos-log initialize --path=/var/lib/aurora/scheduler/db
sudo systemctl start aurora
-
-The second command alters the ZooKeeper path that the mesos distribution registers at.
+ sudo systemctl start thermos-observer
## Create a job
echo "
task = SequentialTask(
processes = [Process(name = 'hello', cmdline = 'echo hello')],
- resources = Resources(cpu = 1.0, ram = 128*MB, disk = 128*MB))
+ resources = Resources(cpu = 0.5, ram = 128*MB, disk = 128*MB))
jobs = [Service(
- task = task, cluster = 'main', role = 'www-data', environment = 'prod', name = 'hello')]" > hello_world.aurora
- aurora job create main/www-data/prod/hello hello_world.aurora
+ task = task, cluster = 'main', role = 'vagrant', environment = 'prod', name = 'hello')]" > hello_world.aurora
+ aurora job create main/vagrant/prod/hello hello_world.aurora
diff --git a/test/rpm/centos-7/provision.sh b/test/rpm/centos-7/provision.sh
index 7148979..199cd43 100644
--- a/test/rpm/centos-7/provision.sh
+++ b/test/rpm/centos-7/provision.sh
@@ -1,10 +1,10 @@
#!/bin/bash
rpm -Uvh https://archive.cloudera.com/cdh4/one-click-install/redhat/6/x86_64/cloudera-cdh-4-0.x86_64.rpm
-yum -y install zookeeper-server
+yum -y install java-1.8.0-headless zookeeper-server
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-0.24.1
+yum -y install mesos-0.25.0
systemctl start mesos-slave mesos-master
