Merge "Clean up temporary artifacts on merge"

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index a3fdf65..e81976a 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -290,6 +290,9 @@
     name: functest-all
     builders:
         - shell: |
+            #!/bin/bash
+            set +e
+
             echo "Functest: prepare Functest environment"
             mkdir -p $HOME/functest/
             source $HOME/functest/opnfv-openrc.sh

diff --git a/jjb/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml
index 0b63798..671b387 100644 (file)
--- a/jjb/genesis/genesis-docs.yml
+++ b/jjb/genesis/genesis-docs.yml
@@ -21,7 +21,7 @@
 - job-template:
     name: 'genesis-merge-docs'
 
-    node: master
+    node: gce-opnfv-docker-1
 
     project-type: freestyle
 
@@ -67,7 +67,7 @@
 - job-template:
     name: 'genesis-verify-docs'
 
-    node: master
+    node: gce-opnfv-docker-1
 
     project-type: freestyle
 
@@ -86,8 +86,8 @@
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     wrappers:
         - ssh-agent-credentials:

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 7057aa3..6e7b40b 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -16,7 +16,7 @@
 - job-template:
     name: 'opnfvdocs-daily-{stream}'
 
-    node: master
+    node: gce-opnfv-docker-1
 
     # Job template for daily builders
     #
@@ -56,7 +56,7 @@
 - job-template:
     name: 'opnfvdocs-verify'
 
-    node: master
+    node: gce-opnfv-docker-1
 
     project-type: freestyle
 
@@ -107,7 +107,7 @@
 - job-template:
     name: 'opnfvdocs-merge'
 
-    node: master
+    node: gce-opnfv-docker-1
 
     # builder-merge job to run JJB update
     #

diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index 4783ba1..d25d851 100644 (file)
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -23,7 +23,7 @@
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
 
-    node: master
+    node: ericsson-build
 
     project-type: freestyle
     varsetabove: '{somevar}'
@@ -72,7 +72,7 @@
 
     project-type: freestyle
 
-    node: master
+    node: ericsson-build
 
     logrotate:
         daysToKeep: 30
@@ -121,9 +121,9 @@
 
     builders:
         - shell: |
-            pwd
-            find .
-            echo "Hello world from yardstick"
+            echo "Running unit tests..."
+            cd $WORKSPACE
+            ./run_tests.sh
 
 - job-template:
     name: 'yardstick-merge'
@@ -134,7 +134,7 @@
 
     project-type: freestyle
 
-    node: master
+    node: ericsson-build
 
     logrotate:
         daysToKeep: 30
@@ -177,6 +177,6 @@
 
     builders:
         - shell: |
-            pwd
-            find .
-            echo "Hello world from yardstick"
+            echo "Running unit tests..."
+            cd $WORKSPACE
+            ./run_tests.sh