From: Anil Belur <abelur@linuxfoundation.org>
Date: Tue, 6 Aug 2019 03:38:38 +0000 (+1000)
Subject: Use release credentials only for merge job wrappers
X-Git-Tag: v0.40.4^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F16451%2F2;p=releng%2Fglobal-jjb.git

Use release credentials only for merge job wrappers

Release creds are only required for promoting the repo, which uses diff ACL
as compared to normal user.

Therefore dont use the release creds for the verify jobs and the
scm sections in both the job templates.

Issue: RELENG-2129
Change-Id: Ibb36d11ba57c5e59a63c414b0b338846eefd8983
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 00acc009..328c65aa 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -39,11 +39,6 @@
           branch: "$GERRIT_BRANCH"
           stream: "$GERRIT_BRANCH"
 
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
-
     publishers:
       - lf-infra-publish
 
@@ -102,6 +97,11 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_release_verify
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
     scm:
       - lf-infra-gerrit-scm:
           git-url: "{git-url}"
@@ -111,7 +111,7 @@
           submodule-recursive: false
           submodule-timeout: 10
           choosing-strategy: gerrit
-          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
@@ -180,9 +180,14 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_release_merge
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
           git-url: "{git-url}"
           refspec: "$GERRIT_REFSPEC"
           branch: "$GERRIT_BRANCH"
diff --git a/releasenotes/notes/fix-release-creds-d12de28b33b81b3c.yaml b/releasenotes/notes/fix-release-creds-d12de28b33b81b3c.yaml
new file mode 100644
index 00000000..e22ab6b5
--- /dev/null
+++ b/releasenotes/notes/fix-release-creds-d12de28b33b81b3c.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Release creds are only required for promoting the repo, which uses diff ACL
+    as compared to normal user. Therefore dont use the release creds for the
+    verify jobs and the scm sections in both the job templates.