From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 12 Jun 2019 23:53:02 +0000 (-0700)
Subject: Add fixes for lf-release-jobs
X-Git-Tag: v0.38.4~1^2~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F15875%2F3;p=releng%2Fglobal-jjb.git

Add fixes for lf-release-jobs

- Add missing scm block in gerrit-releases-merge job definition.
- Add missing submodule-disable for jobs using lf-infra-gerrit-scm.
- Add missing submodule-timeout variable in lf-releases-merge
- Remove submodule "Optional parameters" documentation for
  gerrit-releases-merge and gerrit-releases-verify.

Issue: RELENG-1657
Change-Id: I656fe6d27773022581cba9d8bb6c448ba97cf8e5
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 47559fa6..7375d481 100644
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -70,10 +70,6 @@ Runs:
     :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
     :build-timeout: Timeout in minutes before aborting build. (default: 15)
     :project-pattern: Project to trigger build against. (default: \*\*)
-    :submodule-recursive: Whether to checkout submodules recursively.
-        (default: false)
-    :submodule-timeout: Timeout (in minutes) for checkout operation.
-        (default: 10)
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which
@@ -120,10 +116,6 @@ is available on the job.
     :gerrit-skip-vote: Skip voting for this job. (default: false)
     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
     :project-pattern: Project to trigger build against. (default: \*\*)
-    :submodule-recursive: Whether to checkout submodules recursively.
-        (default: false)
-    :submodule-timeout: Timeout (in minutes) for checkout operation.
-        (default: 10)
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which
diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 2852d4a8..c0e02453 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:
@@ -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}'
 
@@ -151,7 +150,6 @@
     build-timeout: 15
     disable-job: false
     project-pattern: '**'
-    submodule-recursive: true
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -185,6 +183,17 @@
     # 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}'
diff --git a/releasenotes/notes/add-scm-release-jobs-b0ec12b3e59fd520.yaml b/releasenotes/notes/add-scm-release-jobs-b0ec12b3e59fd520.yaml
new file mode 100644
index 00000000..18467736
--- /dev/null
+++ b/releasenotes/notes/add-scm-release-jobs-b0ec12b3e59fd520.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Add missing scm block in gerrit-releases-merge job definition.
+    Add missing submodule-disable variable for jobs using lf-infra-gerrit-scm.
+    Update documentation for gerrit-releases-merge and gerrit-releases-verify
+    to remove submodule options as optional parameters.