diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-08-18 23:51:30 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-08-19 12:42:46 +0200 |
| commit | e54730e53f6515c84dfb32ec7a62e538d86ded68 (patch) | |
| tree | fb07e09359ca49581433929207d9750825295edc | |
| parent | 782bc21e1279db9c99e6a08ef989cbb2b9f2f17c (diff) | |
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>
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 6bc064253..f281f2b90 100644 --- 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: |