aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wick...@apache.org
Subject git commit: AURORA-480: Fix the end-to-end test
Date Tue, 24 Jun 2014 18:08:54 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 9b657eaee -> e374b7107


AURORA-480: Fix the end-to-end test

use pants_support_baseurls instead of pants_support_baseurl
incorporate fix from AURORA-523
add git clean -fdx so that we don't pull up the wrong pants.pex

Testing Done:
mba=aurora=; ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh

Bugs closed: AURORA-480

Reviewed at https://reviews.apache.org/r/22896/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/e374b710
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/e374b710
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/e374b710

Branch: refs/heads/master
Commit: e374b7107ba724846d51a08dc921570b64d56300
Parents: 9b657ea
Author: Brian Wickman <wickman@apache.org>
Authored: Tue Jun 24 11:08:49 2014 -0700
Committer: Brian Wickman <wickman@apache.org>
Committed: Tue Jun 24 11:08:49 2014 -0700

----------------------------------------------------------------------
 .gitignore                                | 28 +++++++++++++-------------
 examples/vagrant/provision-dev-cluster.sh |  8 +-------
 pants.ini                                 |  4 +++-
 3 files changed, 18 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e374b710/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4791787..ad4206d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,20 @@
 # SYNTAX NOTE: dist/ will ignore any directory named dist. Use dist/* to ignore dist in project
root.
-.idea/*
 *.iml
 *.ipr
 *.iws
 *.pyc
 *~
-.coverage
-.gradle/*
-.pants.*
-.vagrant/*
-build/*
-build-support/*.pex
-build-support/*.venv
-build-support/python/*.venv
-build-support/virtualenv-*
-dist/*
-gradle-app.setting
-out/*
-third_party/*
+/.coverage
+/.gradle/*
+/.idea/*
+/.pants.*
+/.vagrant/*
+/build/*
+/build-support/*.pex
+/build-support/*.venv
+/build-support/python/*.venv
+/build-support/virtualenv-*
+/dist/*
+/gradle-app.setting
+/out/*
+/third_party/*

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e374b710/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index e08c0de..f6459a1 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -32,13 +32,7 @@ hostname 192.168.33.7
 
 function build_all() {
   echo Copying aurora source code
-  rsync -urzvh /vagrant/ aurora \
-      --exclude './.gradle' \
-      --exclude './.pants.d' \
-      --exclude './dist/*' \
-      --exclude './build-support/*.venv' \
-      --exclude './build-support/thrift/thrift-*' \
-      --exclude '*.pyc'
+  rsync -urzvh /vagrant/ aurora --filter=':- .gitignore' --exclude=.git
 
   pushd aurora
     # fetch the mesos egg, needed to build python components

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e374b710/pants.ini
----------------------------------------------------------------------
diff --git a/pants.ini b/pants.ini
index 4ecb6f1..e65e273 100644
--- a/pants.ini
+++ b/pants.ini
@@ -21,7 +21,9 @@ rcfiles: ['/etc/pantsrc', '~/.pants.new.rc']
 pants_cachedir: %(homedir)s/.pants.d
 
 # TODO(John Sirois): Come up with a public solution.
-pants_support_baseurl: http://maven.twttr.com/twitter-commons/pants/build-support
+pants_support_baseurls: [
+    'http://maven.twttr.com/twitter-commons/pants/build-support',
+  ]
 pants_support_fetch_timeout_secs: 30
 
 pants_pythons: %(buildroot)s/.python


Mime
View raw message