diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-05-13 12:28:14 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-05-14 14:37:49 -0700 |
| commit | 11a31f0e2c8e3b56b05ce3349f927f1fd9126af2 (patch) | |
| tree | 363909ed34bc25af857c945af924d0589e679f79 | |
| parent | 3c5564298c5f5b387d7780fa847a1f417be091c2 (diff) | |
Upgrade global-jjb
Upgrade to fetch gerrit-maven-docker jobs
Add global default submodule-disable: false
to allow submodule operations
Add submodule-disable: '{submodule-disable}'
for templates using the lf-infra-gerrit-scm macro.
Change-Id: I27c2b1f4442e0c05d07de64d53791e6b193ebef0
Issue-ID: CIMAN-240
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
| m--------- | global-jjb | 0 | ||||
| -rw-r--r-- | jjb/global-defaults.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-templates-docker.yaml | 7 | ||||
| -rw-r--r-- | jjb/global-templates-helm.yaml | 4 | ||||
| -rw-r--r-- | jjb/onap-jjb/onap-pypi-template.yaml | 2 |
5 files changed, 14 insertions, 0 deletions
diff --git a/global-jjb b/global-jjb -Subproject bfea76c9bead88faf10a3ad41ae98ad741ac1b9 +Subproject f56fb3983c20cf5256a544350ac7f7eced1a004 diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index e43a8a29f..b86e65374 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -47,6 +47,7 @@ # git submodule attributes submodule-recursive: true + submodule-disable: false # Jenkins jenkins-ssh-credential: onap-jenkins-ssh diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index db3d4cfc7..1c8242f32 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-disable: false submodule-timeout: 10 ##################### @@ -280,6 +281,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -340,6 +342,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -560,6 +563,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -620,6 +624,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -677,6 +682,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: @@ -729,6 +735,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index f5c6bcde4..12ce9a383 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -17,6 +17,7 @@ git-url: '$GIT_URL/$PROJECT' post_build_script: '' pre_build_script: '' + submodule-disable: false submodule-recursive: true submodule-timeout: 10 @@ -129,6 +130,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -168,6 +170,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -272,6 +275,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default builders: diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml index e5266036a..9de048cc0 100644 --- a/jjb/onap-jjb/onap-pypi-template.yaml +++ b/jjb/onap-jjb/onap-pypi-template.yaml @@ -20,6 +20,7 @@ - compare-type: ANT pattern: '**' + submodule-disable: false submodule-timeout: 10 ##################### @@ -52,6 +53,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default wrappers: |