Add submodule-timeout for submodule operations

Some ONAP projects using CLM (SDC) require more submodule
timeout to let the Nexus report run successfully. Allow an
option to provide a submodule-timeout to gerrit-maven-clm
keeping the default to 10 minutes.

Add submodule-timeout parameter for both lf-infra-gerrit-scm
and lf-infra-github-scm.

Main issue and tests described in the asociated Jira.

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

diff --git a/docs/jjb/lf-c-cpp-jobs.rst b/docs/jjb/lf-c-cpp-jobs.rst
index 4d6d4ce..17d4581 100644 (file)
--- a/docs/jjb/lf-c-cpp-jobs.rst
+++ b/docs/jjb/lf-c-cpp-jobs.rst
@@ -54,6 +54,8 @@ project into a tar.xz tarball to produce a release candidate.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

     :version: (default: '') Project version to stage release as. There are 2
         methods for using this value:
 
     :version: (default: '') Project version to stage release as. There are 2
         methods for using this value:
 


@@ -116,6 +118,8 @@ Verify job which runs cmake && make && make install to test a project build..
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which to filter which file
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which to filter which file

diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst
index b2905f3..4eda20c 100644 (file)
--- a/docs/jjb/lf-ci-jobs.rst
+++ b/docs/jjb/lf-ci-jobs.rst
@@ -348,6 +348,8 @@ Runs `jenkins-jobs update` to update production job configuration
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to


@@ -384,6 +386,8 @@ Runs `jenkins-jobs test` to validate JJB syntax
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to


@@ -451,6 +455,9 @@ other file changes. Verifies INFO.yaml files follow the schema defined in
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)
+

     :gerrit_verify_triggers: Override Gerrit Triggers.
 
 .. _license-checker:
     :gerrit_verify_triggers: Override Gerrit Triggers.
 
 .. _license-checker:


@@ -518,6 +525,8 @@ containing the credentials for the cloud.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
 .. _gjjb-packer-merge:
 
 
 .. _gjjb-packer-merge:
 


@@ -562,6 +571,8 @@ Packer Merge job runs `packer build` to build system images in the cloud.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
 
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
 


@@ -601,6 +612,8 @@ Packer Verify job runs `packer validate` to verify packer configuration.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to

diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst
index 9f35594..34f9e96 100644 (file)
--- a/docs/jjb/lf-macros.rst
+++ b/docs/jjb/lf-macros.rst
@@ -315,6 +315,11 @@ lf-infra-gerrit-scm
 
 Basic SCM configuration for Gerrit based projects.
 
 
 Basic SCM configuration for Gerrit based projects.
 

+:Required parameters:
+
+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)
+

 lf-infra-github-scm
 -------------------
 
 lf-infra-github-scm
 -------------------
 


@@ -324,6 +329,11 @@ On the `branch` variable you can assign `$sha1` or `$ghprbActualCommit`
 as the value.  This will require that the job be triggered via
 the GHPRB plugin and not manually.
 
 as the value.  This will require that the job be triggered via
 the GHPRB plugin and not manually.
 

+:Required parameters:
+
+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)
+

 Wrappers
 ========
 
 Wrappers
 ========
 

diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst
index 494d32d..0e2215c 100644 (file)
--- a/docs/jjb/lf-maven-jobs.rst
+++ b/docs/jjb/lf-maven-jobs.rst
@@ -107,6 +107,8 @@ Produces a CLM scan of the code into Nexus IQ Server.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_merge_triggers: Override Gerrit Triggers.
 
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
 


@@ -151,6 +153,8 @@ Expects javadocs to be available in $WORKSPACE/target/site/apidocs
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_merge_triggers: Override Gerrit Triggers.
 
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
 


@@ -192,6 +196,8 @@ Expects javadocs to be available in $WORKSPACE/target/site/apidocs
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
 
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
 


@@ -252,6 +258,8 @@ This job uses the following strategy to deploy jobs to Nexus:
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to


@@ -306,6 +314,8 @@ directory is then used later to deploy to Nexus.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_release_triggers: Override Gerrit Triggers.
 
 
     :gerrit_release_triggers: Override Gerrit Triggers.
 


@@ -352,6 +362,8 @@ interest in that kind of support.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_sonar_triggers: Override Gerrit Triggers.
 
 
     :gerrit_sonar_triggers: Override Gerrit Triggers.
 


@@ -391,6 +403,8 @@ Verify job which runs mvn clean install to test a project build..
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to


@@ -435,6 +449,8 @@ via comment trigger.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to

diff --git a/docs/jjb/lf-node-jobs.rst b/docs/jjb/lf-node-jobs.rst
index dd57e46..38c7dee 100644 (file)
--- a/docs/jjb/lf-node-jobs.rst
+++ b/docs/jjb/lf-node-jobs.rst
@@ -48,6 +48,8 @@ Verify job for NodeJS projects
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :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
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which

diff --git a/docs/jjb/lf-python-jobs.rst b/docs/jjb/lf-python-jobs.rst
index c1bf65a..0244614 100644 (file)
--- a/docs/jjb/lf-python-jobs.rst
+++ b/docs/jjb/lf-python-jobs.rst
@@ -99,6 +99,8 @@ IQ Server.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

     :gerrit_clm_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which used to filter which
         file modifications will trigger a build. Refer to JJB documentation for
     :gerrit_clm_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which used to filter which
         file modifications will trigger a build. Refer to JJB documentation for


@@ -168,6 +170,8 @@ https://docs.sonarqube.org/display/PLUG/Python+Coverage+Results+Import
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

     :gerrit_sonar_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which used to filter which
         file modifications will trigger a build. Refer to JJB documentation for
     :gerrit_sonar_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which used to filter which
         file modifications will trigger a build. Refer to JJB documentation for


@@ -214,6 +218,8 @@ following pyenv variables before running.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :submodule-timeout: Timeout (in minutes) for checkout operation.
+        (default: 10)

     :tox-dir: Directory containing the project's tox.ini relative to
         the workspace. Empty works if tox.ini is at project root.
         (default: '')
     :tox-dir: Directory containing the project's tox.ini relative to
         the workspace. Empty works if tox.ini is at project root.
         (default: '')

diff --git a/docs/jjb/lf-rtd-jobs.rst b/docs/jjb/lf-rtd-jobs.rst
index b21cee6..c5c9172 100644 (file)
--- a/docs/jjb/lf-rtd-jobs.rst
+++ b/docs/jjb/lf-rtd-jobs.rst
@@ -80,6 +80,8 @@ ReadTheDocs. To do that follow these steps:
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :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
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which


@@ -125,6 +127,8 @@ Verify job which runs a tox build of the docs project
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.
         (default: true)

+    :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
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which

diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml
index 3584bf1..c40af55 100644 (file)
--- a/jjb/lf-c-cpp-jobs.yaml
+++ b/jjb/lf-c-cpp-jobs.yaml
@@ -25,6 +25,7 @@
     pre-build: ''
     stream: master
     submodule-recursive: true
     pre-build: ''
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

     version: ''
 
     #####################
     version: ''
 
     #####################


@@ -116,6 +117,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
 
     triggers:
           choosing-strategy: gerrit
 
     triggers:


@@ -150,6 +152,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -189,6 +192,7 @@
     pre-build: ''
     stream: master
     submodule-recursive: true
     pre-build: ''
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_verify_triggers:
       - patchset-created-event:
 
     gerrit_verify_triggers:
       - patchset-created-event:


@@ -256,6 +260,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
 
     triggers:
           choosing-strategy: gerrit
 
     triggers:


@@ -288,6 +293,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 9cfa4b8..5e47387 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -36,6 +36,7 @@
     github-url: 'https://github.com'
     stream: master
     submodule-recursive: true
     github-url: 'https://github.com'
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

     packer-cloud-settings: packer-cloud-env
     packer-version: 1.2.5
 
     packer-cloud-settings: packer-cloud-env
     packer-version: 1.2.5
 


@@ -99,6 +100,7 @@
     jjb-version: 2.2.1
     stream: master
     submodule-recursive: true
     jjb-version: 2.2.1
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP


@@ -160,6 +162,7 @@
     disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     stream: master
     disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     stream: master

+    submodule-timeout: 10

     gerrit_merge_triggers:
       - comment-added-contains-event:
           comment-contains-value: (un)?lock branch$
     gerrit_merge_triggers:
       - comment-added-contains-event:
           comment-contains-value: (un)?lock branch$


@@ -195,6 +198,7 @@
           refspec: ''
           branch: '{branch}'
           submodule-recursive: false
           refspec: ''
           branch: '{branch}'
           submodule-recursive: false

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -251,6 +255,7 @@
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     github-url: 'https://github.com'
     jenkins-silos: production sandbox
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     github-url: 'https://github.com'
     jenkins-silos: production sandbox

+    submodule-timeout: 10

 
     gerrit_merge_triggers:
       - change-merged-event
 
     gerrit_merge_triggers:
       - change-merged-event


@@ -312,6 +317,7 @@
           refspec: 'refs/heads/{branch}'
           branch: '{branch}'
           submodule-recursive: true
           refspec: 'refs/heads/{branch}'
           branch: '{branch}'
           submodule-recursive: true

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -346,6 +352,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: true
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: true

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -441,6 +448,7 @@
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     stream: master
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     stream: master

+    submodule-timeout: 10

     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
           comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
           comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'


@@ -491,6 +499,7 @@
           refspec: 'refs/heads/{branch}'
           branch: '{branch}'
           submodule-recursive: true
           refspec: 'refs/heads/{branch}'
           branch: '{branch}'
           submodule-recursive: true

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -528,6 +537,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: true
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: true

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -584,6 +594,7 @@
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -623,6 +634,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -704,6 +716,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -743,6 +756,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -796,6 +810,7 @@
     ######################
 
     git-url: '$GIT_URL/$PROJECT'
     ######################
 
     git-url: '$GIT_URL/$PROJECT'

+    submodule-timeout: 10

 
     #####################
     # Job Configuration #
 
     #####################
     # Job Configuration #


@@ -807,6 +822,7 @@
           refspec: ''
           branch: 'master'
           submodule-recursive: true
           refspec: ''
           branch: 'master'
           submodule-recursive: true

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -862,6 +878,7 @@
     project-pattern: '**'
     spdx-disable: false
     stream: master
     project-pattern: '**'
     spdx-disable: false
     stream: master

+    submodule-timeout: 10

 
     #####################
     # Job Configuration #
 
     #####################
     # Job Configuration #


@@ -913,6 +930,7 @@
           branch: '$GERRIT_BRANCH'
           # Submodules are out of the project's control
           submodule-recursive: false
           branch: '$GERRIT_BRANCH'
           # Submodules are out of the project's control
           submodule-recursive: false

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -953,6 +971,7 @@
           branch: '$sha1'
           # Submodules are out of the project's control
           submodule-recursive: false
           branch: '$sha1'
           # Submodules are out of the project's control
           submodule-recursive: false

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1012,6 +1031,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1047,6 +1067,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1082,6 +1103,7 @@
     github-url: 'https://github.com'
     openstack-cloud: vex
     stream: master
     github-url: 'https://github.com'
     openstack-cloud: vex
     stream: master

+    submodule-timeout: 10

 
     #####################
     # Job Configuration #
 
     #####################
     # Job Configuration #


@@ -1140,6 +1162,7 @@
           refspec: 'refs/heads/{branch}'
           branch: '{branch}'
           submodule-recursive: true
           refspec: 'refs/heads/{branch}'
           branch: '{branch}'
           submodule-recursive: true

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1154,6 +1177,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: true
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: true

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1221,6 +1245,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1275,6 +1300,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1370,6 +1396,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1409,6 +1436,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index ac577c8..da6d726 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -532,6 +532,7 @@
           wipe-workspace: true
           submodule:
             recursive: '{submodule-recursive}'
           wipe-workspace: true
           submodule:
             recursive: '{submodule-recursive}'

+            timeout: '{submodule-timeout}'

           choosing-strategy: '{choosing-strategy}'
 
 - scm:
           choosing-strategy: '{choosing-strategy}'
 
 - scm:


@@ -547,6 +548,7 @@
           wipe-workspace: true
           submodule:
             recursive: '{submodule-recursive}'
           wipe-workspace: true
           submodule:
             recursive: '{submodule-recursive}'

+            timeout: '{submodule-timeout}'

           choosing-strategy: '{choosing-strategy}'
 
 ############
           choosing-strategy: '{choosing-strategy}'
 
 ############

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index c5fffb7..7e656f8 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -124,6 +124,7 @@
     nexus-iq-stage: 'build'
     stream: master
     submodule-recursive: true
     nexus-iq-stage: 'build'
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     nexus_iq_scan_patterns:
       - '**/*.ear'
 
     nexus_iq_scan_patterns:
       - '**/*.ear'


@@ -194,6 +195,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
 
     triggers:
           choosing-strategy: default
 
     triggers:


@@ -233,6 +235,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -276,6 +279,7 @@
     mvn-version: mvn35
     stream: master
     submodule-recursive: true
     mvn-version: mvn35
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_merge_triggers:
       - change-merged-event
 
     gerrit_merge_triggers:
       - change-merged-event


@@ -322,6 +326,7 @@
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -355,6 +360,7 @@
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -399,6 +405,7 @@
     mvn-version: mvn35
     stream: master
     submodule-recursive: true
     mvn-version: mvn35
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_verify_triggers:
       - patchset-created-event:
 
     gerrit_verify_triggers:
       - patchset-created-event:


@@ -444,6 +451,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
 
     triggers:
           choosing-strategy: gerrit
 
     triggers:


@@ -476,6 +484,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -516,6 +525,7 @@
     nexus-cut-dirs: 6  # Number of dirs in the Nexus path to remove for wget -r.
     stream: master
     submodule-recursive: true
     nexus-cut-dirs: 6  # Number of dirs in the Nexus path to remove for wget -r.
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_merge_triggers:
       - change-merged-event
 
     gerrit_merge_triggers:
       - change-merged-event


@@ -580,6 +590,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
 
     triggers:
           choosing-strategy: default
 
     triggers:


@@ -614,6 +625,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -663,6 +675,7 @@
     sign-artifacts: false
     stream: master
     submodule-recursive: true
     sign-artifacts: false
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_release_triggers:
       - comment-added-contains-event:
 
     gerrit_release_triggers:
       - comment-added-contains-event:


@@ -729,6 +742,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
 
     triggers:
           choosing-strategy: default
 
     triggers:


@@ -762,6 +776,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -802,6 +817,7 @@
     sonar-mvn-goal: 'sonar:sonar'
     stream: master
     submodule-recursive: true
     sonar-mvn-goal: 'sonar:sonar'
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_sonar_triggers:
       - comment-added-contains-event:
 
     gerrit_sonar_triggers:
       - comment-added-contains-event:


@@ -897,6 +913,7 @@
           refspec: $GERRIT_REFSPEC
           branch: $GERRIT_BRANCH
           submodule-recursive: '{submodule-recursive}'
           refspec: $GERRIT_REFSPEC
           branch: $GERRIT_BRANCH
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
 
 - job-template:
           choosing-strategy: default
 
 - job-template:


@@ -918,6 +935,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -956,6 +974,7 @@
     mvn-version: mvn35
     stream: master
     submodule-recursive: true
     mvn-version: mvn35
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_verify_triggers:
       - patchset-created-event:
 
     gerrit_verify_triggers:
       - patchset-created-event:


@@ -1014,6 +1033,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
 
     triggers:
           choosing-strategy: gerrit
 
     triggers:


@@ -1047,6 +1067,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -1086,6 +1107,7 @@
     mvn-version: mvn35
     stream: master
     submodule-recursive: true
     mvn-version: mvn35
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_verify_triggers:
       - comment-added-contains-event:
 
     gerrit_verify_triggers:
       - comment-added-contains-event:


@@ -1138,6 +1160,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
 
     triggers:
           choosing-strategy: gerrit
 
     triggers:

diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml
index c6bcc9b..36475e5 100644 (file)
--- a/jjb/lf-node-jobs.yaml
+++ b/jjb/lf-node-jobs.yaml
@@ -20,6 +20,7 @@
     node-dir: ''
     stream: master
     submodule-recursive: true
     node-dir: ''
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP


@@ -94,6 +95,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: 'origin/$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: 'origin/$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
 
     triggers:
           choosing-strategy: gerrit
 
     triggers:


@@ -125,6 +127,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index fc342de..78976d9 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -81,6 +81,7 @@
     nexus-iq-namespace: ''  # Recommend a trailing dash when set. Example: odl-
     stream: master
     submodule-recursive: true
     nexus-iq-namespace: ''  # Recommend a trailing dash when set. Example: odl-
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_trigger_file_paths:
       - compare-type: ANT
 
     gerrit_trigger_file_paths:
       - compare-type: ANT


@@ -145,6 +146,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
 
     triggers:
           choosing-strategy: default
 
     triggers:


@@ -185,6 +187,7 @@
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           refspec: ''
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -227,6 +230,7 @@
     sonar-mvn-goal: 'sonar:sonar'
     stream: master
     submodule-recursive: true
     sonar-mvn-goal: 'sonar:sonar'
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP


@@ -325,6 +329,7 @@
           refspec: $GERRIT_REFSPEC
           branch: $GERRIT_BRANCH
           submodule-recursive: '{submodule-recursive}'
           refspec: $GERRIT_REFSPEC
           branch: $GERRIT_BRANCH
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
 
     triggers:
           choosing-strategy: default
 
     triggers:


@@ -364,6 +369,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 


@@ -399,6 +405,7 @@
     python-version: python2
     stream: master
     submodule-recursive: true
     python-version: python2
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

     tox-dir: ''
     tox-envs: ''
 
     tox-dir: ''
     tox-envs: ''
 


@@ -481,6 +488,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: gerrit
 
     triggers:
           choosing-strategy: gerrit
 
     triggers:


@@ -513,6 +521,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 0f4aa8b..7101ae8 100644 (file)
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -165,6 +165,7 @@
     project-pattern: '**'
     stream: master
     submodule-recursive: true
     project-pattern: '**'
     stream: master
     submodule-recursive: true

+    submodule-timeout: 10

     gerrit-skip-vote: false
 
     gerrit_verify_triggers:
     gerrit-skip-vote: false
 
     gerrit_verify_triggers:


@@ -202,6 +203,7 @@
           git-url: '{git-url}'
           refspec: ''  # Leave blank!! A later script will handle fetching
           submodule-recursive: '{submodule-recursive}'
           git-url: '{git-url}'
           refspec: ''  # Leave blank!! A later script will handle fetching
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
 
     triggers:
           choosing-strategy: default
 
     triggers:


@@ -241,6 +243,7 @@
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'

+          submodule-timeout: '{submodule-timeout}'

           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 

diff --git a/releasenotes/notes/submodule-timeout-e75d10f51ca36933.yaml b/releasenotes/notes/submodule-timeout-e75d10f51ca36933.yaml
new file mode 100644 (file)
index 0000000..f13ee74
--- /dev/null
+++ b/releasenotes/notes/submodule-timeout-e75d10f51ca36933.yaml
@@ -0,0 +1,12 @@
+---
+features:
+  - |
+    Add a new ``submodule-timeout`` optional parameter to provide a timeout
+    value (in minutes) for timeout operations.
+
+upgrade:
+  - |
+    Any project using the lf-infra-gerrit-scm and lf-infra-github-scm macros
+    in our out of global-jjb should need to add a submodule-timeout value.
+    It is recommended to set this value to ``10`` since that is the default
+    value used by the Jenkins Git Plugin.