Merge "Use release credentials only for merge job wrappers"

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 00acc00..328c65a 100644 (file)
--- 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 (file)
index 0000000..e22ab6b
--- /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.