X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=c384e5db7ee85773e143050af358b740ff5565d1;hb=refs%2Fchanges%2F19%2F16119%2F3;hp=2852d4a80c0cc5326c4cae8ed122c1a02aec5c77;hpb=d473edacae5c8da2b4da50e6d41b2a1c52316813;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 2852d4a8..c384e5db 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -65,8 +65,6 @@
     disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     project-pattern: '**'
-    submodule-recursive: true
-    submodule-timeout: 10
     gerrit-skip-vote: false
 
     gerrit_verify_triggers:
@@ -100,7 +98,7 @@
       - lf-releases
 
 - job-template:
-    name: '{project-name}-releases-verify'
+    name: '{project-name}-releases-verify-{stream}'
     id: gerrit-releases-verify
     <<: *lf_releases_common
     # yamllint disable-line rule:key-duplicates
@@ -111,8 +109,9 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: 'master'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: true
+          submodule-recursive: false
+          submodule-timeout: 10
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -150,8 +149,8 @@
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
+    git-url: '$GIT_URL/$PROJECT'
     project-pattern: '**'
-    submodule-recursive: true
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -179,12 +178,23 @@
       - lf-releases
 
 - job-template:
-    name: '{project-name}-releases-merge'
+    name: '{project-name}-releases-merge-{stream}'
     id: gerrit-releases-merge
     <<: *lf_releases_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_releases_merge
 
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+          submodule-disable: true
+          submodule-recursive: false
+          submodule-timeout: 10
+          choosing-strategy: default
+
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'