X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=dc3807afcbb07d3fbcefba7a12e57849eef7b870;hb=refs%2Fchanges%2F38%2F16038%2F5;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..dc3807af 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -11,8 +11,8 @@
 # COMMON FUNCTIONS #
 ####################
 
-- lf_releases_common: &lf_releases_common
-    name: lf-releases-common
+- lf_release_common: &lf_release_common
+    name: lf-release-common
 
     ######################
     # Default parameters #
@@ -51,8 +51,8 @@
 # RELEASE VERIFY #
 ##################
 
-- lf_releases_verify: &lf_releases_verify
-    name: lf-releases-verify
+- lf_release_verify: &lf_release_verify
+    name: lf-release-verify
 
     ######################
     # Default parameters #
@@ -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:
@@ -97,22 +95,23 @@
               variable: SIGUL_PKI
       - shell: !include-raw-escape: ../shell/sigul-configuration.sh
       - shell: !include-raw-escape: ../shell/sigul-install.sh
-      - lf-releases
+      - lf-release
 
 - job-template:
-    name: '{project-name}-releases-verify'
-    id: gerrit-releases-verify
-    <<: *lf_releases_common
+    name: '{project-name}-release-verify-{stream}'
+    id: gerrit-release-verify
+    <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_releases_verify
+    <<: *lf_release_verify
 
     scm:
       - lf-infra-gerrit-scm:
           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}'
 
@@ -138,8 +137,8 @@
 # RELEASE MERGE #
 #################
 
-- lf_releases_merge: &lf_releases_merge
-    name: lf-releases-merge
+- lf_release_merge: &lf_release_merge
+    name: lf-release-merge
 
     ######################
     # Default parameters #
@@ -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
@@ -176,14 +175,25 @@
               variable: SIGUL_PKI
       - shell: !include-raw-escape: ../shell/sigul-configuration.sh
       - shell: !include-raw-escape: ../shell/sigul-install.sh
-      - lf-releases
+      - lf-release
 
 - job-template:
-    name: '{project-name}-releases-merge'
-    id: gerrit-releases-merge
-    <<: *lf_releases_common
+    name: '{project-name}-release-merge-{stream}'
+    id: gerrit-release-merge
+    <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_releases_merge
+    <<: *lf_release_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: