From ec67f1e0644c74a6c6beb7bb42b56f8ce68ab24c Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 9 Nov 2011 17:46:28 -0800
Subject: [PATCH] more progress on jenkins on clean build
---
tools/jenkins/jenkins_home/build_jenkins.sh | 7 +++++++
tools/jenkins/jenkins_home/jobs/kvm/config.xml | 4 ++--
tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber | 1 -
3 files changed, 9 insertions(+), 3 deletions(-)
delete mode 100644 tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber
diff --git a/tools/jenkins/jenkins_home/build_jenkins.sh b/tools/jenkins/jenkins_home/build_jenkins.sh
index bd17f1c8d9..bbba8b0705 100755
--- a/tools/jenkins/jenkins_home/build_jenkins.sh
+++ b/tools/jenkins/jenkins_home/build_jenkins.sh
@@ -41,6 +41,13 @@ cat > $JENKINS_GITCONF <<EOF
</hudson.plugins.git.GitSCM_-DescriptorImpl>
EOF
+# Add build numbers
+for job in ${`ls jobs`// / }; do
+ if [ ! -e jobs/$job/nextBuildNumber ]; then
+ echo 1 > jobs/$job/nextBuildNumber
+ fi
+done
+
# Set ownership to jenkins
chown -R jenkins $CUR_DIR
diff --git a/tools/jenkins/jenkins_home/jobs/kvm/config.xml b/tools/jenkins/jenkins_home/jobs/kvm/config.xml
index ccf0541b4b..453044ba67 100644
--- a/tools/jenkins/jenkins_home/jobs/kvm/config.xml
+++ b/tools/jenkins/jenkins_home/jobs/kvm/config.xml
@@ -47,7 +47,7 @@
<name>ADAPTER</name>
<values>
<string>euca</string>
- <string>floatingips</string>
+ <string>floating_ips</string>
</values>
</hudson.matrix.TextAxis>
</axes>
@@ -69,4 +69,4 @@ sudo ./run_test.sh $EXECUTOR_NUMBER $ADAPTER</command>
<publishers/>
<buildWrappers/>
<runSequentially>false</runSequentially>
-</matrix-project>
\ No newline at end of file
+</matrix-project>
diff --git a/tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber b/tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber
deleted file mode 100644
index d00491fd7e..0000000000
--- a/tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber
+++ /dev/null
@@ -1 +0,0 @@
-1