Merge "add lab path for volume option with joid"

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 50e2a1b..0edcbab 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -24,7 +24,7 @@
         - joid:
             node: 'intel-us-deploy-bare-pod5'
             installer_type: 'compass'
-            installer_ip: '127.0.0.1'            
+            installer_ip: '127.0.0.1'
     pod:
         - orange-test1:
             node: 'orange-test1'
@@ -306,7 +306,7 @@
 
     builders:
         - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
+            echo "Hello World"
 
 - job-template:
     name: 'functest-merge-{stream}'

diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index d4d21a3..c08b1ca 100644 (file)
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -225,11 +225,11 @@
     builders:
         - shell: |
             #! /bin/bash
-            if [[ ! -f $HOME/opnfv-openrc.sh ]]; then
-               echo "Unable to access file $HOME/opnfv-openrc.sh"
+            if [[ ! -f $WORKSPACE/opnfv-openrc.sh ]]; then
+               echo "Unable to access file $WORKSPACE/opnfv-openrc.sh"
                exit 1
             fi
-            source $HOME/opnfv-openrc.sh
+            source $WORKSPACE/opnfv-openrc.sh
             cd $WORKSPACE
             echo "Running QTIP dhrystone with First Test case"
             python qtip.py -s compute -b dhrystone_serial.yaml
@@ -240,11 +240,11 @@
     builders:
         - shell: |
             #!/bin/bash
-            if [[ ! -f $HOME/opnfv-openrc.sh ]]; then
-               echo "Unable to access file $HOME/opnfv-openrc.sh"
+            if [[ ! -f $WORKSPACE/opnfv-openrc.sh ]]; then
+               echo "Unable to access file $WORKSPACE/opnfv-openrc.sh"
                exit 1
             fi
-            source $HOME/opnfv-openrc.sh
+            source $WORKSPACE/opnfv-openrc.sh
             cd $WORKSPACE
             echo "Running QTIP dhrystone with Second Test case"
             python qtip.py -s compute -b ssl_parallel.yaml
@@ -252,5 +252,11 @@
 - builder:
     name: qtip-fetch-os-cred
     builders:
-        - shell:
-            !include-raw ../../utils/fetch_os_creds.sh
+        - shell: |
+            echo $HOME
+            echo $WORKSPACE
+            cd $WORKSPACE
+            git clone https://gerrit.opnfv.org/gerrit/releng
+            cd $WORKSPACE/releng/utils
+            ./fetch_os_creds.sh                  #To test the problem with creating the file in $HOME
+            ./fetch_os_creds.sh -d $WORKSPACE    #To test if  the file can be created in $WORKSPACE