Revert "Fetch CLM updates from global-jjb"

Issue-ID: CIMAN-33
This reverts commit 8347dc8797721948bae806eec936ef24137a512e.

Change-Id: I6ef5f5138f65360d57abd6d3000c00f24c8f60e5
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>

diff --git a/global-jjb b/global-jjb
index edc8300..e907c5a 160000 (submodule)
--- 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 735b982..8d1c40d 100644 (file)
--- 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 #
@@ -275,7 +274,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -334,7 +332,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -549,7 +546,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -608,7 +604,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -664,7 +659,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
@@ -715,7 +709,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 ecc2305..79a0077 100644 (file)
--- 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 #
@@ -178,7 +177,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 (file)
--- 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: