commit 66eef76923491fac5bd44f93251d57a8195355c0
author Zack Williams <zdw@opennetworking.org> Mon May 07 17:06:03 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Mon May 07 17:06:03 2018 -0700
tree 3fb2019651bd2193d3ccaebe695d886c36484ba1
parent 90c665337e32bb7c7be60da74ffbf4d78dcf4d2c

Fix post-merge jobs to use head of merge, not patchset refspec

Change-Id: Ic614f26d55b3f6bf1662546e7b730236932749fe

jjb/helm.yaml

diff --git a/jjb/helm.yaml b/jjb/helm.yaml
index 7d95659..a72eb11 100644
--- a/jjb/helm.yaml
+++ b/jjb/helm.yaml
@@ -14,6 +14,8 @@
 - job-template:
     id: publish-helm-repo
     name: 'publish-helm-repo'
+    description: |
+      Created by publish-helm-repo job-template from ci-management/jjb/helm.yaml
 
     triggers:
       - cord-infra-gerrit-trigger-merge:
@@ -36,7 +38,7 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
+          refspec: 'refs/heads/$GERRIT_BRANCH'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
           choosing-strategy: gerrit

jjb/sonar.yaml

diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
index 8173268..97d241c 100644
--- a/jjb/sonar.yaml
+++ b/jjb/sonar.yaml
@@ -101,7 +101,7 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
+          refspec: 'refs/heads/$GERRIT_BRANCH'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
           choosing-strategy: gerrit