diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-02-26 11:58:24 +0000 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-02-26 12:20:15 +0000 |
| commit | 375ecea18576cb947ba8ea40218a35ab0c9709c8 (patch) | |
| tree | 01039acc53b312a29c4336dcafc6747e7783a304 /jjb/xci/xci-verify-jobs.yml | |
| parent | 90f5aa7749149fb0fc1a886133e3e761404330fc (diff) | |
xci: Fix the Gerrit Trigger clone issue for external scenarios
When a patch comes in for an external scenario, Gerrit Trigger injects
refs for that patch for the corresponding project. With the previous
configuration, job attempts to get that patch for releng-xci instead
of the actual project.
But switching to the right project causes Jenkins jobs to fail since
the releng-xci will not be checked out to WORKSPACE.
This change makes the clone for the repo/patch work and then it wipes
out the WORKSPACE and clones releng-xci there to get the actual script
parts to work.
Change-Id: Ide31c21a209dff953118f51e9b09de1d206a3085
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci/xci-verify-jobs.yml')
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 40e9ee388..da031c96d 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -129,7 +129,7 @@ parameters: - project-parameter: - project: '{project}' + project: $GERRIT_PROJECT branch: '{branch}' - label: name: SLAVE_LABEL @@ -142,7 +142,7 @@ default: 'true' - string: name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/releng-xci + default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' builders: @@ -159,8 +159,8 @@ current-parameters: true predefined-parameters: | DISTRO={distro} - DEPLOY_SCENARIO=os-nosdn-nofeature CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES + GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -176,14 +176,14 @@ current-parameters: true predefined-parameters: | DISTRO={distro} - DEPLOY_SCENARIO=os-nosdn-nofeature CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES - FUNCTEST_MODE=tier - FUNCTEST_TIER=healthcheck + GERRIT_PROJECT=$GERRIT_PROJECT GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + FUNCTEST_MODE=tier + FUNCTEST_TIER=healthcheck node-parameters: true kill-phase-on: NEVER abort-all-job: true @@ -209,7 +209,7 @@ parameters: - string: name: PROJECT - default: 'releng-xci' + default: $GERRIT_PROJECT - string: name: DISTRO default: 'ubuntu' @@ -236,7 +236,7 @@ default: 'osa' - string: name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/releng-xci + default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' wrappers: |