aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/auto-build/create-latest-build-listing.py30
-rwxr-xr-xscripts/auto-build/prep-auto-build-upload15
2 files changed, 36 insertions, 9 deletions
diff --git a/scripts/auto-build/create-latest-build-listing.py b/scripts/auto-build/create-latest-build-listing.py
new file mode 100755
index 00000000..eb201205
--- /dev/null
+++ b/scripts/auto-build/create-latest-build-listing.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+
+import string
+import os,sys,errno
+import re
+import StringIO
+
+
+for root, dirs, files in os.walk('/var/www/auto-build/'):
+ dirs.sort()
+ if 'latest' in dirs:
+ dirs.remove('latest')
+ if 'test' in dirs:
+ dirs.remove('test')
+ for name in files:
+ m = re.search('^Pd-[01]\.[0-9][0-9].*[^5]$', name)
+ if m:
+ commonbuildname = re.sub('-20[01][0-9][01][0-9][0-9][0-9]', '', name)
+ commonbuildpath = os.path.join('/var/www/auto-build/test', commonbuildname)
+ buildtarball = os.path.join(root, m.string)
+ #print "link: ", buildtarball, commonbuildpath
+ try:
+ os.symlink(buildtarball, commonbuildpath)
+ except OSError, e:
+ if e.errno == errno.EEXIST:
+ #print "removing ", commonbuildpath
+ os.remove(commonbuildpath)
+ os.symlink(buildtarball, commonbuildpath)
+
+
diff --git a/scripts/auto-build/prep-auto-build-upload b/scripts/auto-build/prep-auto-build-upload
index 8cbc4b67..c63f4e56 100755
--- a/scripts/auto-build/prep-auto-build-upload
+++ b/scripts/auto-build/prep-auto-build-upload
@@ -2,11 +2,11 @@
# prepare a directory per date for the auto-builders to upload to
-HOSTNAME=$(hostname)
-SYSTEM=$(uname -s)
-DATE=$(date +%Y-%m-%d)
-TIME=$(date +%H.%M.%S)
-SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
+HOSTNAME=`hostname`
+SYSTEM=`uname -s`
+DATE=`date +%Y-%m-%d`
+TIME=`date +%H.%M.%S`
+SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt
#BUILD_ROOT="/var/www/auto-build"
@@ -20,10 +20,7 @@ prep_project()
mkdir "${TODAYS_ROOT}" >> $LOGFILE 2>&1
mkdir "${TODAYS_ROOT}/logs" >> $LOGFILE 2>&1
chown -R nobody.nogroup "${TODAYS_ROOT}" >> $LOGFILE 2>&1
-
- rm -f -- ${BUILD_ROOT}/latest >> $LOGFILE 2>&1
- ln -s ${TODAYS_ROOT} ${BUILD_ROOT}/latest >> $LOGFILE 2>&1
-
+
chown -R ${PROJECT}.${PROJECT} /home/${PROJECT}/ >> $LOGFILE 2>&1
chmod -R u+rw /home/${PROJECT}/ >> $LOGFILE 2>&1
}