Merge "Retrieve latest_stable bugfix in Functest jenkins job"

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