Repository: aurora Updated Branches: refs/heads/master be2174b50 -> 4c12c1ec1
Fixing e2e tests failing due to mesos-slave state. Reviewed at https://reviews.apache.org/r/49478/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/4c12c1ec Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/4c12c1ec Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/4c12c1ec Branch: refs/heads/master Commit: 4c12c1ec17d983949a4850e30cb0650104db8dd1 Parents: be2174b Author: Maxim Khutornenko <[email protected]> Authored: Thu Jun 30 18:37:46 2016 -0700 Committer: Maxim Khutornenko <[email protected]> Committed: Thu Jun 30 18:37:46 2016 -0700 ---------------------------------------------------------------------- build-support/packer/README.md | 6 +++++- examples/vagrant/provision-dev-cluster.sh | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/4c12c1ec/build-support/packer/README.md ---------------------------------------------------------------------- diff --git a/build-support/packer/README.md b/build-support/packer/README.md index b3570ad..78a66ee 100644 --- a/build-support/packer/README.md +++ b/build-support/packer/README.md @@ -51,7 +51,11 @@ will be helpful to update this box and keep this cost low. config.vm.box = "aurora-dev-env-testing" - At this point, you can use the box as normal to run integraion tests. + and comment out vm version + + # config.vm.box_version = "0.0.X" + + At this point, you can use the box as normal to run integration tests. 6. Upload the box to Vagrant Cloud Our boxes are stored [here](https://atlas.hashicorp.com/apache-aurora/boxes/dev-environment). http://git-wip-us.apache.org/repos/asf/aurora/blob/4c12c1ec/examples/vagrant/provision-dev-cluster.sh ---------------------------------------------------------------------- diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh index b1f661e..2c78677 100755 --- a/examples/vagrant/provision-dev-cluster.sh +++ b/examples/vagrant/provision-dev-cluster.sh @@ -75,6 +75,8 @@ function prepare_sources { cp /vagrant/examples/vagrant/mesos_config/etc_mesos-master/* /etc/mesos-master stop mesos-master || true stop mesos-slave || true + # Remove slave metadata to ensure slave start does not pick up old state. + rm -rf /var/lib/mesos/meta/slaves/latest start mesos-master start mesos-slave
