xci: Several bugfixes for the verify job

- Fix environment variables set by the job
- Fix the default distro in deploy job since the {distro} is not passed to it
- Navigate to correct directory where xci-deploy.sh is located

Change-Id: Ie412dc4852a4aac5aae5c1f26bb271281ebbc111
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 6bc0642..f281f2b 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -109,6 +109,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'xci-virtual-{distro}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 
     builders:
         - description-setter:
@@ -162,7 +166,7 @@
     parameters:
         - string:
             name: DISTRO
-            default: '{distro}'
+            default: 'xenial'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-noha'
@@ -173,11 +177,15 @@
             name: XCI_FLAVOR
             default: 'mini'
         - string:
-            name: XCI_DEVEL_ROOT
-            default: $WORKSPACE
+            name: OPNFV_RELENG_DEV_PATH
+            default: $WORKSPACE/
         - string:
             name: ANSIBLE_VERBOSITY
             default: '-vvvv'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 
     wrappers:
         - ssh-agent-wrapper
@@ -202,7 +210,11 @@
         - shell: |
             #!/bin/bash
 
-            cd $WORKSPACE
+            # for some reason, the PATH is not set correctly
+            # setting PATH for ansible stuff
+            export PATH=/home/jenkins/.local/bin:$PATH
+
+            cd $WORKSPACE/xci
             ./xci-deploy.sh
 
 - builder: