You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by se...@apache.org on 2016/06/20 17:50:17 UTC
aurora git commit: Ensure we can verify release candidates in the
Vagrant box
Repository: aurora
Updated Branches:
refs/heads/master f6ac13b16 -> ca8372ff7
Ensure we can verify release candidates in the Vagrant box
* bump the virtualbox memory to make the tests pass
(otherwise failing with 'Cannot allocate memory')
* remove unnecessary destroy step that seems to be copy
pasted from the egg-building scripts.
Reviewed at https://reviews.apache.org/r/48591/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/ca8372ff
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/ca8372ff
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/ca8372ff
Branch: refs/heads/master
Commit: ca8372ff7f5ce92e350f5a43085e6cc792f36685
Parents: f6ac13b
Author: Stephan Erb <se...@apache.org>
Authored: Mon Jun 20 19:49:44 2016 +0200
Committer: Stephan Erb <se...@apache.org>
Committed: Mon Jun 20 19:49:44 2016 +0200
----------------------------------------------------------------------
Vagrantfile | 2 +-
build-support/release/verify-release-candidate | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/ca8372ff/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index b2b8f00..e7e113d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,7 +30,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.define "devcluster" do |dev|
dev.vm.network :private_network, ip: "192.168.33.7"
dev.vm.provider :virtualbox do |vb|
- vb.customize ["modifyvm", :id, "--memory", "2048"]
+ vb.customize ["modifyvm", :id, "--memory", "3072"]
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
end
dev.vm.provision "shell", path: "examples/vagrant/provision-dev-cluster.sh"
http://git-wip-us.apache.org/repos/asf/aurora/blob/ca8372ff/build-support/release/verify-release-candidate
----------------------------------------------------------------------
diff --git a/build-support/release/verify-release-candidate b/build-support/release/verify-release-candidate
index 7aa9c90..3b9beee 100755
--- a/build-support/release/verify-release-candidate
+++ b/build-support/release/verify-release-candidate
@@ -62,12 +62,8 @@ run_tests() {
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
}
-# TODO(wfarner): Share this with make-mesos-native-egg.
setup_tempdir() {
cleanup() {
- if [[ -f Vagrantfile ]]; then
- vagrant destroy -f
- fi
rm -fr "$TMPDIR"
}
trap cleanup EXIT