From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Mon, 25 Jan 2010 10:55:17 +0000 (+0000)
Subject: cleanup
X-Git-Tag: foo~210
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3a41ee6046905e747f16dcaf49bcc91331aa43e2;p=infrastructure.git

cleanup
---

diff --git a/scripts/dump-db-svn.sh b/scripts/dump-db-svn.sh
index 362fddc..cf518c8 100755
--- a/scripts/dump-db-svn.sh
+++ b/scripts/dump-db-svn.sh
@@ -15,7 +15,33 @@ LATESTLOG=latest.log
 
 REVISION="$Revision$"
 
-source $COMMANDDIR/functions.sh
+### create a symlink in same dir
+# arguments 
+# actual : full path of the actual file
+# link : the link name, only basename is used, will be created in same dir
+function manage_link () {
+    actual=$1; shift
+    latest=$1; shift
+    # go in the right directory
+    cd $(dirname $actual)
+    actualbase=$(basename $actual)
+    # just in case 
+    latest=$(basename $latest)
+    echo "In $(pwd) : linking $actualbase to $latest"
+    rm -f $latest ; ln -s $actualbase $latest
+    # go back to current dir
+    cd -
+}
+    
+# usage
+# clean <where> <keeptime> [... find arguments]
+function clean () {
+    where=$1; shift
+    keeptime=$1; shift
+    echo "== In $where"
+    echo "Cleaning $@ - older than $keeptime days"
+    find $where "$@" -atime +$keeptime | xargs rm 
+}
 
 ###
 
diff --git a/scripts/functions.sh b/scripts/functions.sh
deleted file mode 100644
index 8815389..0000000
--- a/scripts/functions.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-### -*-sh-*-
-
-
-
-### create a symlink in same dir
-# arguments 
-# actual : full path of the actual file
-# link : the link name, only basename is used, will be created in same dir
-function manage_link () {
-    actual=$1; shift
-    latest=$1; shift
-    # go in the right directory
-    cd $(dirname $actual)
-    actualbase=$(basename $actual)
-    # just in case 
-    latest=$(basename $latest)
-    echo "In $(pwd) : linking $actualbase to $latest"
-    rm -f $latest ; ln -s $actualbase $latest
-    # go back to current dir
-    cd -
-}
-    
-# usage
-# clean <where> <keeptime> [... find arguments]
-function clean () {
-    where=$1; shift
-    keeptime=$1; shift
-    echo "== In $where"
-    echo "Cleaning $@ - older than $keeptime days"
-    find $where "$@" -atime +$keeptime | xargs rm 
-}
-
diff --git a/scripts/all-builds.py b/scripts/need-review/all-builds.py
similarity index 94%
rename from scripts/all-builds.py
rename to scripts/need-review/all-builds.py
index 6225862..ac55cf4 100755
--- a/scripts/all-builds.py
+++ b/scripts/need-review/all-builds.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 subversion_id = "$Id$"
 
+import sys
 from optparse import OptionParser
 
 ##############################
@@ -18,10 +19,14 @@ MAJOR_HASH = {
               'tags': '-t %(pldistro)s-tags-4.2.mk',
               },
     '4.3' : { 'latest': None,
-              'fcdistros' : ['centos5','f10','f8'],
-              'pldistros' : ['planetlab','onelab'],
-#              'tags': '-t %(pldistro)s-tags.mk',
-              'tags': '',
+              'fcdistros' : ['centos5','f12','f10','f8'],
+              'pldistros' : ['onelab'],
+              'tags': '-t %(pldistro)s-tags.mk',
+              },
+    '5.0' : { 'latest': None,
+              'fcdistros' : ['centos5','f12','f10','f8'],
+              'pldistros' : ['onelab'],
+              'tags': '-t %(pldistro)s-k27-tags.mk',
               },
 }
     
diff --git a/scripts/alpha-repo.py b/scripts/need-review/alpha-repo.py
similarity index 100%
rename from scripts/alpha-repo.py
rename to scripts/need-review/alpha-repo.py
diff --git a/scripts/diff-module.sh b/scripts/trash/diff-module.sh
similarity index 100%
rename from scripts/diff-module.sh
rename to scripts/trash/diff-module.sh
diff --git a/scripts/import-module.sh b/scripts/trash/import-module.sh
similarity index 100%
rename from scripts/import-module.sh
rename to scripts/trash/import-module.sh
diff --git a/scripts/matching_passwds.py b/scripts/trash/matching_passwds.py
similarity index 100%
rename from scripts/matching_passwds.py
rename to scripts/trash/matching_passwds.py
diff --git a/scripts/nightly-build-cvs.sh b/scripts/trash/nightly-build-cvs.sh
similarity index 100%
rename from scripts/nightly-build-cvs.sh
rename to scripts/trash/nightly-build-cvs.sh
diff --git a/scripts/nightly-build.sh b/scripts/trash/nightly-build.sh
similarity index 100%
rename from scripts/nightly-build.sh
rename to scripts/trash/nightly-build.sh
diff --git a/scripts/reboot-all.sh b/scripts/trash/reboot-all.sh
similarity index 100%
rename from scripts/reboot-all.sh
rename to scripts/trash/reboot-all.sh
diff --git a/scripts/tag-module.sh b/scripts/trash/tag-module.sh
similarity index 100%
rename from scripts/tag-module.sh
rename to scripts/trash/tag-module.sh
diff --git a/scripts/trash-failed-builds.sh b/scripts/trash/trash-failed-builds.sh
similarity index 100%
rename from scripts/trash-failed-builds.sh
rename to scripts/trash/trash-failed-builds.sh
diff --git a/scripts/trim-vserver-builds.sh b/scripts/trash/trim-vserver-builds.sh
similarity index 100%
rename from scripts/trim-vserver-builds.sh
rename to scripts/trash/trim-vserver-builds.sh
diff --git a/scripts/zombie-vservers.sh b/scripts/trash/zombie-vservers.sh
similarity index 100%
rename from scripts/zombie-vservers.sh
rename to scripts/trash/zombie-vservers.sh