Permalink
Browse files

sync ci jobs before push

Change-Id: Ibef8f81fbcc1fb408fec8a99fa38580929415954
  • Loading branch information...
1 parent 3732803 commit 96de29bf07232a46cd862c28ae70c25ba7f604e8 @eveningwear eveningwear committed Sep 13, 2012
Showing with 396 additions and 228 deletions.
  1. +8 −9 src/jenkins_jobs/ACM/config.xml.erb
  2. +15 −7 src/jenkins_jobs/ACM_Gerrit_Trigger/config.xml.erb
  3. +6 −6 src/jenkins_jobs/BOSH_Agent_Functional_Tests/config.xml.erb
  4. +6 −6 src/jenkins_jobs/BOSH_Agent_Unit_Tests/config.xml.erb
  5. +6 −6 src/jenkins_jobs/BOSH_Blobstore_Client_Unit_Tests_19/config.xml.erb
  6. +7 −6 src/jenkins_jobs/BOSH_Common_Unit_tests_19/config.xml.erb
  7. +6 −6 src/jenkins_jobs/BOSH_Director_Unit_Tests/config.xml.erb
  8. +11 −2 src/jenkins_jobs/BOSH_Integration_Tests/config.xml.erb
  9. +6 −8 src/jenkins_jobs/FWKINT_Java_Unit_Tests/config.xml.erb
  10. +6 −6 src/jenkins_jobs/MEMBRANE_UNIT_TESTS/config.xml.erb
  11. +21 −8 src/jenkins_jobs/SERVICES_Backup_Manager_Unit_Test/config.xml.erb
  12. +12 −17 src/jenkins_jobs/SERVICES_Couchdb_New/config.xml.erb
  13. +22 −9 src/jenkins_jobs/SERVICES_Echo_New/config.xml.erb
  14. +25 −9 src/jenkins_jobs/SERVICES_ElasticSearch_New/config.xml.erb
  15. +20 −8 src/jenkins_jobs/SERVICES_Filesystem_Unit_Test/config.xml.erb
  16. +20 −8 src/jenkins_jobs/SERVICES_Mongo_New/config.xml.erb
  17. +21 −11 src/jenkins_jobs/SERVICES_Mysql_New/config.xml.erb
  18. +21 −8 src/jenkins_jobs/SERVICES_Neo4j_New/config.xml.erb
  19. +21 −8 src/jenkins_jobs/SERVICES_Postgres_New/config.xml.erb
  20. +20 −15 src/jenkins_jobs/SERVICES_Rabbit_New/config.xml.erb
  21. +20 −8 src/jenkins_jobs/SERVICES_Redis_New/config.xml.erb
  22. +23 −8 src/jenkins_jobs/SERVICES_Serialization_Unit_Test/config.xml.erb
  23. +21 −11 src/jenkins_jobs/SERVICES_Service_Broker_Unit_Test/config.xml.erb
  24. +20 −1 src/jenkins_jobs/SERVICES_Vblob_Unit_Test/config.xml.erb
  25. +6 −6 src/jenkins_jobs/SERVICES_Warden_Gerrit_Trigger/config.xml.erb
  26. +6 −11 src/jenkins_jobs/TOOLS_Collector/config.xml.erb
  27. +1 −1 src/jenkins_jobs/UAA_Gem/config.xml.erb
  28. +1 −1 src/jenkins_jobs/UAA_Gerrit_Trigger/config.xml.erb
  29. +6 −6 src/jenkins_jobs/VCAP_CC_TESTS/config.xml.erb
  30. +6 −6 src/jenkins_jobs/VCAP_DEA_TESTS/config.xml.erb
  31. +6 −6 src/jenkins_jobs/VCAP_HM_TESTS/config.xml.erb
@@ -2,21 +2,19 @@
<project>
<actions/>
<description></description>
-  <logRotator>
-    <daysToKeep>30</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
+ <logRotator>
+ <daysToKeep>30</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
- <categories/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
- <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
<scm class="hudson.plugins.git.GitSCM">
@@ -53,6 +51,7 @@
<gitConfigName></gitConfigName>
<gitConfigEmail></gitConfigEmail>
<skipTag>false</skipTag>
+ <includedRegions></includedRegions>
<scmName></scmName>
</scm>
<canRoam>true</canRoam>
@@ -130,7 +129,7 @@ rm -f $TEST_RUNNER</command>
</targets>
</hudson.plugins.rubyMetrics.rcov.RcovPublisher>
<hudson.tasks.Mailer>
- <recipients>jdsa@vmware.com</recipients>
+ <recipients>jdsa@vmware.com cf-id-notifications@rbcon.com</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
@@ -2,12 +2,12 @@
<project>
<actions/>
<description></description>
-  <logRotator>
-    <daysToKeep>30</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
+ <logRotator>
+ <daysToKeep>30</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -43,6 +43,8 @@
<buildFailureMessage></buildFailureMessage>
<buildSuccessfulMessage></buildSuccessfulMessage>
<buildUnstableMessage></buildUnstableMessage>
+ <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
+ <customUrl></customUrl>
</com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
</triggers>
<concurrentBuild>true</concurrentBuild>
@@ -78,6 +80,12 @@
</configs>
</hudson.plugins.parameterizedtrigger.TriggerBuilder>
</builders>
- <publishers/>
+ <publishers>
+ <hudson.tasks.Mailer>
+ <recipients>cf-id@rbcon.com cf-id-notifications.com</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
<buildWrappers/>
</project>
@@ -3,12 +3,12 @@
<actions/>
<description>Agent Functional Tests</description>
<displayName>Agent Functional Tests</displayName>
- <logRotator>
- <daysToKeep>30</daysToKeep>
- <numToKeep>50</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>-1</artifactNumToKeep>
- </logRotator>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -3,12 +3,12 @@
<actions/>
<description>Agent Unit Tests</description>
<displayName>Agent Unit Tests</displayName>
- <logRotator>
- <daysToKeep>30</daysToKeep>
- <numToKeep>50</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>-1</artifactNumToKeep>
- </logRotator>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -3,12 +3,12 @@
<actions/>
<description></description>
<displayName>Blobstore Client Unit Tests (1.9)</displayName>
- <logRotator>
- <daysToKeep>30</daysToKeep>
- <numToKeep>50</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>-1</artifactNumToKeep>
- </logRotator>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -3,12 +3,12 @@
<actions/>
<description></description>
<displayName>Bosh Common Unit Tests (1.9)</displayName>
-  <logRotator>
-    <daysToKeep>30</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
+ <logRotator>
+ <daysToKeep>30</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -52,6 +52,7 @@
<gitConfigName></gitConfigName>
<gitConfigEmail></gitConfigEmail>
<skipTag>false</skipTag>
+ <includedRegions></includedRegions>
<scmName></scmName>
</scm>
<canRoam>true</canRoam>
@@ -3,12 +3,12 @@
<actions/>
<description></description>
<displayName>Director Unit Tests</displayName>
- <logRotator>
- <daysToKeep>30</daysToKeep>
- <numToKeep>50</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>-1</artifactNumToKeep>
- </logRotator>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -5,7 +5,7 @@
<displayName>Integration Tests</displayName>
<logRotator>
<daysToKeep>30</daysToKeep>
- <numToKeep>30</numToKeep>
+ <numToKeep>-1</numToKeep>
<artifactDaysToKeep>-1</artifactDaysToKeep>
<artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
@@ -110,5 +110,14 @@ destroy $HANDLE
<testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
</publishers>
- <buildWrappers/>
+ <buildWrappers>
+ <hudson.plugins.build__timeout.BuildTimeoutWrapper>
+ <timeoutMinutes>3</timeoutMinutes>
+ <failBuild>false</failBuild>
+ <writingDescription>false</writingDescription>
+ <timeoutPercentage>200</timeoutPercentage>
+ <timeoutType>elastic</timeoutType>
+ <timeoutMinutesElasticDefault>120</timeoutMinutesElasticDefault>
+ </hudson.plugins.build__timeout.BuildTimeoutWrapper>
+ </buildWrappers>
</project>
@@ -3,21 +3,19 @@
<actions/>
<description></description>
<displayName>Java Unit Tests</displayName>
-  <logRotator>
-    <daysToKeep>30</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
+ <logRotator>
+ <daysToKeep>30</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<maxConcurrentPerNode>1</maxConcurrentPerNode>
<maxConcurrentTotal>4</maxConcurrentTotal>
- <categories/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
- <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
<scm class="hudson.plugins.git.GitSCM">
@@ -3,12 +3,12 @@
<actions/>
<description>Membrane unit tests</description>
<displayName>Membrane Unit Tests</displayName>
- <logRotator>
- <daysToKeep>30</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>-1</artifactNumToKeep>
- </logRotator>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
<keepDependencies>false</keepDependencies>
<properties>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty>
@@ -68,16 +68,10 @@
RUBY19_REALPATH=`readlink -nf $VCAP_RUBY19`
SQLITE_REALPATH=`readlink -nf $VCAP_SQLITE`
GIT_REALPATH=`readlink -nf $VCAP_GIT`
+WARDEN_DEPOT=$WARDEN_INSTANCES
BM_SVC=$PWD/tools
-#
-# HACK - Base expects to be able to write to /var/vcap/sys/run/LOCK
-#
-SCRATCHPAD=$BM_SVC/xxx_scratchpad
-rm -rf $SCRATCHPAD
-mkdir $SCRATCHPAD
-
TEST_RUNNER=`mktemp`
cat &lt;&lt;-EOT &gt; $TEST_RUNNER
#!/bin/bash
@@ -91,6 +85,10 @@ export LIBRARY_PATH=$SQLITE_REALPATH/lib:$LIBRARY_PATH
export C_INCLUDE_PATH=$SQLITE_REALPATH/include:$C_INCLUDE_PATH
export CI_ENV=&apos;jenkins&apos;
+# nats expects to write in /var/vcap/sys/run
+sudo mkdir -p /var/vcap/sys/run
+sudo chown -R vcap:vcap /var/vcap/sys/run
+
cd /tmp/bm_source/tools/backup/manager
rm -rf .bundle
@@ -101,7 +99,22 @@ bundle exec nats-server --daemonize --pid /tmp/nats.pid
bundle exec rake spec:ci
EOT
-HANDLE=`$WARDEN_REPL -e -c &quot;create bind_mount:$RUBY19_REALPATH,$RUBY19_REALPATH,ro bind_mount:$GIT_REALPATH,$GIT_REALPATH,ro bind_mount:$SQLITE_REALPATH,$SQLITE_REALPATH,ro bind_mount:$SCRATCHPAD,/var/vcap/sys/run,rw&quot;`
+HANDLE=`$CREATE_CONTAINER $RUBY19_REALPATH $GIT_REALPATH $SQLITE_REALPATH`
+
+echo &quot;enable vcap could execute sudo without password within warden&quot;
+sudo ls $WARDEN_DEPOT/$HANDLE/ssh/ssh_config
+set +e
+vcap_sudo_line=&quot;vcap ALL=(ALL) NOPASSWD:ALL&quot;
+vcap_chk_ret=`sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container cat /etc/sudoers | grep &quot;$vcap_sudo_line&quot;`
+if test -z &quot;$vcap_chk_ret&quot;
+then
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container chmod 740 /etc/sudoers
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container &quot;echo \&quot;Defaults:vcap !requiretty\&quot; &gt;&gt; /etc/sudoers&quot;
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container &quot;echo \&quot;$vcap_sudo_line\&quot; &gt;&gt; /etc/sudoers&quot;
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container chmod 440 /etc/sudoers
+fi
+set -e
+
$WARDEN_REPL -e -x -c &quot;
copy $HANDLE in $BM_SVC /tmp/bm_source
copy $HANDLE in $TEST_RUNNER /tmp
@@ -70,17 +70,10 @@ COUCHDB_REALPATH=`readlink -nf $VCAP_COUCHDB`
ERLANG_REALPATH=`readlink -nf $VCAP_ERLANG`
SQLITE_REALPATH=`readlink -nf $VCAP_SQLITE`
GIT_REALPATH=`readlink -nf $VCAP_GIT`
-WARDEN_PKG=/var/vcap/packages/warden/warden
+WARDEN_DEPOT=$WARDEN_INSTANCES
COUCHDB_SVC=$PWD/couchdb
-#
-# HACK - Base expects to be able to write to /var/vcap/sys/run/LOCK
-#
-SCRATCHPAD=$COUCHDB_SVC/xxx_scratchpad
-rm -rf $SCRATCHPAD
-mkdir $SCRATCHPAD
-
TEST_RUNNER=`mktemp`
cat &lt;&lt;-EOT &gt; $TEST_RUNNER
#!/bin/bash
@@ -92,6 +85,10 @@ export LIBRARY_PATH=$SQLITE_REALPATH/lib:$VCAP_MYSQLCLIENT/lib/mysql:$VCAP_MYSQL
export C_INCLUDE_PATH=$SQLITE_REALPATH/include:$C_INCLUDE_PATH
export LD_LIBRARY_PATH=$VCAP_MYSQLCLIENT/lib/mysql:$VCAP_MYSQL/lib/mysql:$LD_LIBRARY_PATH
+# nats expects to write in /var/vcap/sys/run
+mkdir -p /var/vcap/sys/run
+chown -R vcap:vcap /var/vcap/sys/run
+
mkdir -p /var/vcap/packages/couchdb
mkdir -p /tmp/log
cp -r /var/vcap/packages/erlang/* /usr/
@@ -102,8 +99,6 @@ yes | sudo apt-get install xulrunner-1.9.2-dev
find /usr/lib -maxdepth 1 -type d -name &quot;xulrunner-*&quot; | grep -v &apos;addons&apos; &gt; /tmp/new.xulrunner.conf
cp /tmp/new.xulrunner.conf /etc/ld.so.conf.d/xulrunner.conf &amp;&amp; /sbin/ldconfig
-#ls /usr/lib/xulrunner-1.9.2*
-
yes | sudo apt-get install libicu-dev
touch /tmp/log/couch.log
@@ -131,20 +126,20 @@ bundle exec nats-server --daemonize --pid /tmp/nats.pid
bundle exec rake spec:ci
EOT
-HANDLE=`$WARDEN_REPL -e -c &quot;create bind_mount:$RUBY19_REALPATH,$RUBY19_REALPATH,ro bind_mount:$GIT_REALPATH,$GIT_REALPATH,ro bind_mount:$SQLITE_REALPATH,$SQLITE_REALPATH,ro bind_mount:$SCRATCHPAD,/var/vcap/sys/run,rw bind_mount:$VCAP_ERLANG,$VCAP_ERLANG,ro disk_size_mb:4096 &quot;`
+HANDLE=`$WARDEN_REPL -e -c &quot;create bind_mount:$RUBY19_REALPATH,$RUBY19_REALPATH,ro bind_mount:$GIT_REALPATH,$GIT_REALPATH,ro bind_mount:$SQLITE_REALPATH,$SQLITE_REALPATH,ro bind_mount:$VCAP_ERLANG,$VCAP_ERLANG,ro disk_size_mb:4096 &quot;`
# use root here because we need to copy something into the /usr/bin directory
echo &quot;enable vcap could execute sudo without password within warden&quot;
-sudo ls $WARDEN_PKG/root/linux/instances/$HANDLE/ssh/ssh_config
+sudo ls $WARDEN_DEPOT/$HANDLE/ssh/ssh_config
set +e
vcap_sudo_line=&quot;vcap ALL=(ALL) NOPASSWD:ALL&quot;
-vcap_chk_ret=`sudo ssh -T -F $WARDEN_PKG/root/linux/instances/$HANDLE/ssh/ssh_config root@container cat /etc/sudoers | grep &quot;$vcap_sudo_line&quot;`
+vcap_chk_ret=`sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container cat /etc/sudoers | grep &quot;$vcap_sudo_line&quot;`
if test -z &quot;$vcap_chk_ret&quot;
then
- sudo ssh -T -F $WARDEN_PKG/root/linux/instances/$HANDLE/ssh/ssh_config root@container chmod 740 /etc/sudoers
- sudo ssh -T -F $WARDEN_PKG/root/linux/instances/$HANDLE/ssh/ssh_config root@container &quot;echo \&quot;Defaults:vcap !requiretty\&quot; &gt;&gt; /etc/sudoers&quot;
- sudo ssh -T -F $WARDEN_PKG/root/linux/instances/$HANDLE/ssh/ssh_config root@container &quot;echo \&quot;$vcap_sudo_line\&quot; &gt;&gt; /etc/sudoers&quot;
- sudo ssh -T -F $WARDEN_PKG/root/linux/instances/$HANDLE/ssh/ssh_config root@container chmod 440 /etc/sudoers
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container chmod 740 /etc/sudoers
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container &quot;echo \&quot;Defaults:vcap !requiretty\&quot; &gt;&gt; /etc/sudoers&quot;
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container &quot;echo \&quot;$vcap_sudo_line\&quot; &gt;&gt; /etc/sudoers&quot;
+ sudo ssh -T -F $WARDEN_DEPOT/$HANDLE/ssh/ssh_config root@container chmod 440 /etc/sudoers
fi
set -e
Oops, something went wrong.

0 comments on commit 96de29b

Please sign in to comment.