From 020845e00f0613b1b5ca3ce4ea8a6e26e4378a43 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 12 Feb 2016 18:35:05 -0500 Subject: [PATCH] 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 --- jjb/ci-management-jobs.yaml | 2 ++ jjb/global-macros.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- 2.16.6