Add SDN Controller Name and OPNFV Feature to functest build names

[releng.git] / jjb / functest / functest.yml

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 155bbcf..5aa178b 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -7,7 +7,7 @@
     project: '{name}'
 
     pod:
-        - opnfv-jump-1:
+        - intel-us-deploy-virtual-2:
             installer: apex
         - opnfv-jump-2:
             installer: fuel
@@ -44,7 +44,7 @@
 
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER: $FUNCTEST_SUITE_NAME'
+            name: '$BUILD_NUMBER: $FUNCTEST_SUITE_NAME $SDN_CONTROLLER $OPNFV_FEATURE'
 
     parameters:
         - project-parameter:
@@ -201,7 +201,7 @@
             elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
                 # If production lab then creds may be retrieved dynamically
                 # creds are on the jumphost, always in the same folder
-                labconfig="-v ${HOME}/joid_config/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
+                labconfig="-v /var/lib/jenkins/joid_config/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
                 # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
                 # replace the default one by the customized one provided by jenkins config
                 if [ -n "${LAB_CONFIG}" ]; then