diff options
| author |   Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-02-12 18:35:05 -0500 |
|---|---|---|
| committer | Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-02-12 18:41:36 -0500 |
| commit | 020845e00f0613b1b5ca3ce4ea8a6e26e4378a43 (patch) | |
| tree | e8ad9f5e310832c840d76a11b2846766f320ca02 /jjb | |
| parent | 70cfdc0fa1a1942aa17eb5c12437ef9a1af5cb40 (diff) | |
Fix ci-management-verify not testing the submitted commit
The ci verify job was testing branch HEAD which doesn't help us verify
code submissions. This patch fixes it so that we pass a parameter
{commit} to represent the branch or commit that we should run against.
Sets the merge job to run against $ZUUL_BRANCH while the verify job
runs against $ZUUL_COMMIT.
Change-Id: I9516bfc14a9981c5e8348e0a6324a3c15b5afc32
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-management-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/jjb/ci-management-jobs.yaml b/jjb/ci-management-jobs.yaml index 010e220b0..343a34e9e 100644 --- a/jjb/ci-management-jobs.yaml +++ b/jjb/ci-management-jobs.yaml @@ -24,6 +24,7 @@ - zuul-trigger-scm: credentials-id: '{ssh-credentials}' refspec: '$ZUUL_REF' + commit: '$ZUUL_COMMIT' wrappers: - ssh-agent-credentials: @@ -55,6 +56,7 @@ - zuul-trigger-scm: credentials-id: '{ssh-credentials}' refspec: '' + commit: 'origin/$ZUUL_BRANCH' wrappers: - ssh-agent-credentials: diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index d5fd41ee8..9c0eeacbb 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -74,7 +74,7 @@ url: '$ZUUL_URL/$ZUUL_PROJECT' refspec: '{refspec}' branches: - - 'origin/$ZUUL_BRANCH' + - '{commit}' skip-tag: true wipe-workspace: true |