diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-10-29 11:17:16 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-10-29 11:20:03 -0700 |
| commit | 7d10bdfa1931a7b1f3360b4ced72899f36e109ed (patch) | |
| tree | 42fd68701a1e2fd1602d2529cf8fbd2b66311735 /jjb | |
| parent | f0d8c2a1749886d599f5e301053799a89938da17 (diff) | |
Fetch CLM updates from global-jjb
This reverts commit d0e846cb0025bf9f68ce363cfdd42fa403d95968.
Fetch lastest HEAD of global-jjb now that lftools 0.18.0
has been released.
Localy used lf-infra-gerrit-scm macros need to be updated to
add a "submodule-timeout" value as part of global-jjb:
commit 9fdb611f1fce34d54be1af81d7baedb86726302c.
Issue-ID: CIMAN-33
Change-Id: Ib29b625bb63e1c03988b23122b3157e62de3fa03
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-docker.yaml | 7 | ||||
| -rw-r--r-- | jjb/global-templates-helm.yaml | 2 | ||||
| -rw-r--r-- | jjb/onap-jjb/onap-pypi-template.yaml | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 3052dc2db..db3d4cfc7 100644 --- 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 # @@ -278,6 +279,7 @@ refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: true + submodule-timeout: '{submodule-timeout}' choosing-strategy: default builders: @@ -337,6 +339,7 @@ refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: true + submodule-timeout: '{submodule-timeout}' choosing-strategy: default builders: @@ -556,6 +559,7 @@ refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: true + submodule-timeout: '{submodule-timeout}' choosing-strategy: default builders: @@ -615,6 +619,7 @@ refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: true + submodule-timeout: '{submodule-timeout}' choosing-strategy: default builders: @@ -671,6 +676,7 @@ refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: true + submodule-timeout: '{submodule-timeout}' choosing-strategy: default builders: @@ -722,6 +728,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 664d14ea3..6c139ddb8 100644 --- 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 # @@ -182,6 +183,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 632bc8e2a..e5266036a 100644 --- 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: |