Merge "Fix global-templates unstable jobs"
diff --git a/global-jjb b/global-jjb
index edc8300..e907c5a 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit edc83001e85ae50e3694a4feb0236dfacc71d61e
+Subproject commit e907c5af374f9d7bf3196543d853921697dbf17c
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index db3d4cf..3052dc2 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -24,7 +24,6 @@
     # Default to LF standard 'snapshots' docker registry
     docker_registry: '$DOCKER_REGISTRY:10003'
     docker_tag: 'latest'
-    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -279,7 +278,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -339,7 +337,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -559,7 +556,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -619,7 +615,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -676,7 +671,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -728,7 +722,6 @@
           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 6c139dd..664d14e 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -16,7 +16,6 @@
     pre_build_script: ''
     build_script: ''
     post_build_script: ''
-    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -183,7 +182,6 @@
           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 e526603..632bc8e 100644
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -20,8 +20,6 @@
       - compare-type: ANT
         pattern: '**'
 
-    submodule-timeout: 10
-
     #####################
     # Job Configuration #
     #####################
@@ -51,7 +49,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     wrappers: