You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/04/03 17:01:13 UTC
[1/3] git commit: Setup pysvn in venv before doing a rebuild
Updated Branches:
refs/heads/master 7d53aacbe -> cb210e98e
Setup pysvn in venv before doing a rebuild
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/cb210e98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/cb210e98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/cb210e98
Branch: refs/heads/master
Commit: cb210e98e3a29999ac8bf49adf725a01cde0e8aa
Parents: c0f67e3
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Apr 3 13:18:29 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 3 14:49:42 2013 +0000
----------------------------------------------------------------------
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cb210e98/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 12c9048..e9565d3 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,11 @@ PID_PATH?=.
test:
ifdef BB
# running on buildbot (Makefile.def.buildbot sets BB to 1)
-# rebuild apps
- ./rebuild-all.bash
# setup pysvn
-[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/
-[ ! -d $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info ] && mkdir $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info
+# rebuild apps
+ ./rebuild-all.bash
endif
ALLURA_VALIDATION=none ./run_tests
./run_clonedigger
[3/3] git commit: Make pysvn symlinks on buildbot
Posted by br...@apache.org.
Make pysvn symlinks on buildbot
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e9ad55a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e9ad55a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e9ad55a7
Branch: refs/heads/master
Commit: e9ad55a73f6a984c25e14e5df7a532b92fc8e1bd
Parents: 7d53aac
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Apr 3 11:22:45 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 3 14:49:42 2013 +0000
----------------------------------------------------------------------
Makefile.def.buildbot | 1 +
run_clonedigger | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e9ad55a7/Makefile.def.buildbot
----------------------------------------------------------------------
diff --git a/Makefile.def.buildbot b/Makefile.def.buildbot
index 93aff55..f88ae0e 100644
--- a/Makefile.def.buildbot
+++ b/Makefile.def.buildbot
@@ -3,5 +3,6 @@ test: buildbot_test
buildbot_test:
./rebuild-all.bash
-[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/
+ -[ ! -d $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info ] && mkdir $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info
ALLURA_VALIDATION=none ./run_tests
./run_clonedigger
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e9ad55a7/run_clonedigger
----------------------------------------------------------------------
diff --git a/run_clonedigger b/run_clonedigger
index 8ebfbce..58e8fdb 100755
--- a/run_clonedigger
+++ b/run_clonedigger
@@ -17,10 +17,11 @@ if [ "$TEST_MODULES" == "" ]; then
ForgeChat \
ForgeDiscussion \
ForgeGit \
- ForgeHg \
ForgeSVN \
ForgeTracker \
ForgeWiki \
+ ForgeActivity \
+ ForgeShortUrl \
"
fi
[2/3] git commit: Don't run tests twice on 42cc buildbot
Posted by br...@apache.org.
Don't run tests twice on 42cc buildbot
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c0f67e31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c0f67e31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c0f67e31
Branch: refs/heads/master
Commit: c0f67e3184b1a1d299b794e2bdecd2a2aa9a26e5
Parents: e9ad55a
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Apr 3 12:55:43 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 3 14:49:42 2013 +0000
----------------------------------------------------------------------
Makefile | 8 ++++++++
Makefile.def.buildbot | 9 +--------
2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c0f67e31/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index dfe1ea4..12c9048 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,14 @@ PID_PATH?=.
# Targets
test:
+ifdef BB
+# running on buildbot (Makefile.def.buildbot sets BB to 1)
+# rebuild apps
+ ./rebuild-all.bash
+# setup pysvn
+ -[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/
+ -[ ! -d $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info ] && mkdir $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info
+endif
ALLURA_VALIDATION=none ./run_tests
./run_clonedigger
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c0f67e31/Makefile.def.buildbot
----------------------------------------------------------------------
diff --git a/Makefile.def.buildbot b/Makefile.def.buildbot
index f88ae0e..82179d7 100644
--- a/Makefile.def.buildbot
+++ b/Makefile.def.buildbot
@@ -1,8 +1 @@
-test: buildbot_test
-
-buildbot_test:
- ./rebuild-all.bash
- -[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/
- -[ ! -d $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info ] && mkdir $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info
- ALLURA_VALIDATION=none ./run_tests
- ./run_clonedigger
+BB=1