From 1a0d7bf2f5d5c632f1c5c417844d910cadad57e2 Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 11 Apr 2019 22:29:45 +1000
Subject: [PATCH] Update jenkins-cfg-verify to use $GERRIT_REFSPEC

Update jenkins-cfg to verify images names updated from the
$GERRIT_REFSPEC instead of the master branch.

Current implementation uses the 'master' branch instead of
the $GERRIT_REFSPEC, therefore failing the verify job
on false positives.

Issue: RELENG-1950
Change-Id: I6f212b28e4189ff5c7958035c7992b55d7153d02
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
 jjb/lf-ci-jobs.yaml                                                 | 6 +++---
 .../notes/update-gerrit-scm-jenkins-cfg-17c18c7ae5a7143f.yaml       | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/update-gerrit-scm-jenkins-cfg-17c18c7ae5a7143f.yaml

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index ebf637fd..bdebb0f5 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -484,11 +484,11 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: '{git-url}'
-          refspec: 'refs/heads/{branch}'
-          branch: '{branch}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: default
+          choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
diff --git a/releasenotes/notes/update-gerrit-scm-jenkins-cfg-17c18c7ae5a7143f.yaml b/releasenotes/notes/update-gerrit-scm-jenkins-cfg-17c18c7ae5a7143f.yaml
new file mode 100644
index 00000000..cffe0474
--- /dev/null
+++ b/releasenotes/notes/update-gerrit-scm-jenkins-cfg-17c18c7ae5a7143f.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Update jenkins-cfg-verify job to validate new images names obtained from
+    $GERRIT_REFSPEC instead of the master branch.
-- 
2.16.6