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>

diff --git a/jjb/ci-management-jobs.yaml b/jjb/ci-management-jobs.yaml
index 010e220..343a34e 100644 (file)
--- 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 d5fd41e..9c0eeac 100644 (file)
--- 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