Merge "Fix docker command to run in background in Functest jenkins job"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index b00674b..24fa4b1 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -91,6 +91,8 @@
 
     node: opnfv-jump-1
 
+    disabled: true
+
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -162,9 +164,6 @@
             refspec: ''
             branch: '{branch}'
 
-    triggers:
-        - 'apex-{stream}'
-
     builders:
         - 'apex-build'
         - 'apex-deploy-virtual'
@@ -240,6 +239,10 @@
             use-build-blocker: true
             blocking-jobs:
                 - "apex-daily.*"
+
+    triggers:
+        - 'apex-{stream}'
+
     builders:
         - trigger-builds:
           - project: 'apex-build-{stream}'
@@ -267,7 +270,7 @@
     parameters:
         - string:
             name: ARTIFACT_NAME
-            default: ''
+            default: 'latest'
             description: "RPM Artifact name that will be appended to GS_URL to deploy a specific artifact"
         - string:
             name: BUILD_DIRECTORY
@@ -388,7 +391,7 @@
             echo "--------------------------------------------------------"
             echo
 
-            if [[ -z "$ARTIFACT_NAME" ]]; then
+            if [[ ! "$ARTIFACT_NAME" == "latest" ]]; then
                 # if artifact name is passed the pull a
                 # specific artifact from artifacts.opnfv.org
                 RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME

diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh
index a65395b..626a650 100755 (executable)
--- a/jjb/fuel/fuel-deploy-virtual.sh
+++ b/jjb/fuel/fuel-deploy-virtual.sh
@@ -18,7 +18,7 @@ chmod a+x $HOME
 chmod a+x $TMPDIR
 
 # set CONFDIR, BRIDGE
-CONFDIR=$WORKSPACE/deploy/templates/virtual_environment/conf
+CONFDIR=$WORKSPACE/deploy/templates/virtual_environment_noha/conf
 BRIDGE=pxebr
 
 # log info to console

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 78c2471..1b2d406 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -16,7 +16,7 @@
 - job-template:
     name: 'storperf-verify-{stream}'
 
-    node: intel-jp-build-1
+    node: opnfv-build
 
     logrotate:
         daysToKeep: 30
@@ -70,7 +70,7 @@
     #
     # This job's purpose is to update all the JJB
 
-    node: intel-jp-build-1
+    node: opnfv-build
 
     parameters:
         - project-parameter:
@@ -117,7 +117,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: intel-jp-build-1
+    node: opnfv-build
 
     disabled: true
 

diff --git a/utils/test/result_collection_api/resources/models.py b/utils/test/result_collection_api/resources/models.py
index 6829416..a15d4e3 100644 (file)
--- a/utils/test/result_collection_api/resources/models.py
+++ b/utils/test/result_collection_api/resources/models.py
@@ -84,7 +84,6 @@ class TestProject:
             "name": self.name,
             "description": self.description,
             "creation_date": str(self.creation_date),
-            "test_cases": test_cases
         }