From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 6 Dec 2010 12:19:52 +0000 (+0100)
Subject: cleanup - now runs back on EU side i.e. liquid
X-Git-Tag: foo~45
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=04c51e3d2809b42d9b4eaae0d2c0fe308515b020;hp=c47d4fa4c29280ae59dfabf1a947431431eabbc6;p=infrastructure.git

cleanup - now runs back on EU side i.e. liquid
---

diff --git a/scripts/all-modules.sh b/scripts/all-modules.sh
index a89881e..b33276e 100755
--- a/scripts/all-modules.sh
+++ b/scripts/all-modules.sh
@@ -1,36 +1,32 @@
 #!/bin/bash
 
-# NOTE
-# as the svn diff operations from a remote location are so sssssslllllllooooooooowwwwww...
-# what we do:
-# maintain codebase in onelab.eu for historical reasons
-# (1) push scripts on princeton (manually run all-modules-update.sh)
-# (2) run the scripts cyclically over there through cron
-# and push the results on build.onelab.eu with all-modules.push.sh (as part of the cron job)
-#
+# reviewed in dec. 2010
+# moving back to running on the EU side
+# 
 # this script is a wrapper around the module-tools (version and diff)
 # it is invoked cyclically
 # prior to that, the following directories will have been svn updated :
-# ~/svn-build
-# ~/root/svn-build-4.2
+# ~/git-build
 
 # avoid running several instances of this script
 # when the svn server has problems, this can very well last quite a while
 
 COMMAND=$(basename $0)
 
+# running as root on liquid
+OUTPUT=/build/modules
+LOCK=~/all-modules.run
 # make sure the cyclic tasks do not interfere with manual usage
-#WORKDIR_SVN=${HOME}/all-modules-svn
+# (i.e. do not use ~/modules)
 WORKDIR_GIT=${HOME}/all-modules-git
-
-# make the command usable as non-root user at Princeton for more efficiency
-if [ "$(id -u)" == "0" ] ; then
-    OUTPUT=/build/modules/slow
-    LOCK=/var/run/all-modules.pid
-else
-    OUTPUT=~/all-modules
-    LOCK=~/all-modules.run
-fi
+########## sample config running on liquid
+#svnpath=http://svn.planet-lab.org/svn/
+#gitserver=git.onelab.eu
+#gituser=root
+#build=build
+#username=not-needed-as-we-dont-write
+#email=not-needed-as-we-dont-write
+##########
 
 function do_update() {
     build_dir=$1; shift
@@ -94,18 +90,23 @@ function main () {
     
     echo $$ > $LOCK
 
-# the 5.0 flavour now comes with a non-compatible flavour of the module-tools
-# and we need 2 distinc workdirs
     do_update  ~/git-build
     do_version ~/git-build     $WORKDIR_GIT 5.0 
     do_diff    ~/git-build     $WORKDIR_GIT 5.0
-### dropped the 4.3 branxh while moving to git...
-#    do_update  ~/svn-build-4.3
-#    do_version ~/svn-build-4.3 $WORKDIR_SVN 4.3 
-#    do_diff    ~/svn-build-4.3 $WORKDIR_SVN 4.3
 
     rm $LOCK
 
 }
 
 main "$@"
+
+########################################
+# this applied to the older version that was running at princeton
+# NOTE
+# as the svn diff operations from a remote location are so sssssslllllllooooooooowwwwww...
+# what we do:
+# maintain codebase in onelab.eu for historical reasons
+# (1) push scripts on princeton (manually run all-modules-update.sh)
+# (2) run the scripts cyclically over there through cron
+# and push the results on build.onelab.eu with all-modules.push.sh (as part of the cron job)
+#