Fetch CLM updates from global-jjb

Update global-jjb submodule to HEAD to fetch
submodule-timeout feature.

Add submodule-timeout on local jjb templates
using the lf-infra-gerrit-scm macro as the global-jjb
upgrade has this breaking change.

Change-Id: I15e478d0c44f11eba4f98400e726d5c8dd6616d1
Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/global-jjb b/global-jjb
index e907c5a..edc8300 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit e907c5af374f9d7bf3196543d853921697dbf17c
+Subproject commit edc83001e85ae50e3694a4feb0236dfacc71d61e

diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 8d1c40d..735b982 100644 (file)
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -24,6 +24,7 @@
     # Default to LF standard 'snapshots' docker registry
     docker_registry: '$DOCKER_REGISTRY:10003'
     docker_tag: 'latest'
+    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -274,6 +275,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -332,6 +334,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -546,6 +549,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -604,6 +608,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -659,6 +664,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -709,6 +715,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 79a0077..ecc2305 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -16,6 +16,7 @@
     pre_build_script: ''
     build_script: ''
     post_build_script: ''
+    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -177,6 +178,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:

diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index 632bc8e..e526603 100644 (file)
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -20,6 +20,8 @@
       - compare-type: ANT
         pattern: '**'
 
+    submodule-timeout: 10
+
     #####################
     # Job Configuration #
     #####################
@@ -49,6 +51,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     wrappers: