From 00d1d5eda276c8cf5f03b000bf6df8e9656080e5 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 23 Apr 2019 19:03:58 +0200 Subject: [PATCH] Add submodule-disable for submodule operations Some Akraino projects using git scm have a large number of submodules which are not required during most CI/CD operations (e.g. we don't want to fetch GBs of 3rd party repositories when linting the code). Add submodule-disable parameter for both lf-infra-gerrit-scm and lf-infra-github-scm, allowing us to disable submodule fetching where needed. Jenkins git plugin support for this was added in [1]. This change is very similar and mostly based on the addition of the submodule-timeout parameter in commit 9fdb611f1. [1] https://issues.jenkins-ci.org/browse/JENKINS-6658 Change-Id: Ia99ba7f353a39e55d7bec57778f447f94402b5e6 Signed-off-by: Alexandru Avadanii --- docs/jjb/lf-c-cpp-jobs.rst | 6 ++++ docs/jjb/lf-ci-jobs.rst | 16 ++++++++++ docs/jjb/lf-macros.rst | 4 +++ docs/jjb/lf-maven-jobs.rst | 17 +++++++++++ docs/jjb/lf-node-jobs.rst | 2 ++ docs/jjb/lf-python-jobs.rst | 6 ++++ docs/jjb/lf-rtd-jobs.rst | 4 +++ docs/jjb/lf-whitesource-jobs.rst | 2 ++ jjb/lf-c-cpp-jobs.yaml | 9 ++++++ jjb/lf-ci-jobs.yaml | 34 ++++++++++++++++++++++ jjb/lf-info-vote.yaml | 2 ++ jjb/lf-macros.yaml | 2 ++ jjb/lf-maven-jobs.yaml | 29 ++++++++++++++++++ jjb/lf-node-jobs.yaml | 3 ++ jjb/lf-python-jobs.yaml | 9 ++++++ jjb/lf-rtd-jobs.yaml | 3 ++ jjb/lf-whitesource-jobs.yaml | 3 ++ .../notes/submodule-disable-007e41e593d9b11c.yaml | 16 ++++++++++ 18 files changed, 167 insertions(+) create mode 100644 releasenotes/notes/submodule-disable-007e41e593d9b11c.yaml diff --git a/docs/jjb/lf-c-cpp-jobs.rst b/docs/jjb/lf-c-cpp-jobs.rst index 0e014916..03372c0f 100644 --- a/docs/jjb/lf-c-cpp-jobs.rst +++ b/docs/jjb/lf-c-cpp-jobs.rst @@ -57,6 +57,8 @@ to support multi-branch. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_sonar_triggers: Override Gerrit Triggers. @@ -111,6 +113,8 @@ project into a tar.xz tarball to produce a release candidate. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :version: (default: '') Project version to stage release as. There are 2 methods for using this value: @@ -175,6 +179,8 @@ Verify job which runs cmake && make && make install to test a project build.. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which to filter which file diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index 5ad9b6a3..bd477b90 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -139,6 +139,8 @@ Job submits a patch to lock or unlock a project's branch. Often the same as the branch. (default: master) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_merge_triggers: Override Gerrit Triggers. .. _lf-global-jjb-jenkins-cfg-merge: @@ -433,6 +435,8 @@ Runs `jenkins-jobs update` to update production job configuration (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_merge_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which can be used to @@ -476,6 +480,8 @@ Runs `jenkins-jobs test` to validate JJB syntax (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :throttle_categories: List of categories to throttle by. :throttle-enabled: Whether or not to enable throttling on the job. (default: true) @@ -555,6 +561,8 @@ other file changes. Verifies INFO.yaml files follow the schema defined in (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. @@ -638,6 +646,8 @@ containing the credentials for the cloud. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) Minimal Example: @@ -693,6 +703,8 @@ Packer Merge job runs `packer build` to build system images in the cloud. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. @@ -750,6 +762,8 @@ Packer Verify job runs `packer validate` to verify packer configuration. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which can be used to @@ -797,3 +811,5 @@ the base directory is usually the best place to run from. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst index 133795e0..2471b98c 100644 --- a/docs/jjb/lf-macros.rst +++ b/docs/jjb/lf-macros.rst @@ -356,6 +356,8 @@ Basic SCM configuration for Gerrit based projects. :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) lf-infra-github-scm ------------------- @@ -370,6 +372,8 @@ the GHPRB plugin and not manually. :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) Wrappers ======== diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst index 1a0dc1ec..48a688ee 100644 --- a/docs/jjb/lf-maven-jobs.rst +++ b/docs/jjb/lf-maven-jobs.rst @@ -141,6 +141,8 @@ Produces a CLM scan of the code into Nexus IQ Server. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_merge_triggers: Override Gerrit Triggers. @@ -187,6 +189,8 @@ Expects javadocs to be available in $WORKSPACE/target/site/apidocs (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_merge_triggers: Override Gerrit Triggers. @@ -230,6 +234,8 @@ Expects javadocs to be available in $WORKSPACE/target/site/apidocs (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. @@ -292,6 +298,9 @@ This job uses the following strategy to deploy jobs to Nexus: (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) + :gerrit_merge_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which can be used to filter which file modifications will trigger a build. @@ -380,6 +389,8 @@ directory is then used later to deploy to Nexus. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_release_triggers: Override Gerrit Triggers. @@ -466,6 +477,8 @@ interest in that kind of support. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_sonar_triggers: Override Gerrit Triggers. @@ -513,6 +526,8 @@ Verify job which runs mvn clean install to test a project build.. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which can be used to @@ -580,6 +595,8 @@ via comment trigger. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which can be used to diff --git a/docs/jjb/lf-node-jobs.rst b/docs/jjb/lf-node-jobs.rst index 38c7dee5..8cf3af0b 100644 --- a/docs/jjb/lf-node-jobs.rst +++ b/docs/jjb/lf-node-jobs.rst @@ -50,6 +50,8 @@ Verify job for NodeJS projects (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths filter which checks which diff --git a/docs/jjb/lf-python-jobs.rst b/docs/jjb/lf-python-jobs.rst index 02446141..2845e06b 100644 --- a/docs/jjb/lf-python-jobs.rst +++ b/docs/jjb/lf-python-jobs.rst @@ -101,6 +101,8 @@ IQ Server. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_clm_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which used to filter which file modifications will trigger a build. Refer to JJB documentation for @@ -172,6 +174,8 @@ https://docs.sonarqube.org/display/PLUG/Python+Coverage+Results+Import (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_sonar_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths which used to filter which file modifications will trigger a build. Refer to JJB documentation for @@ -220,6 +224,8 @@ following pyenv variables before running. (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :tox-dir: Directory containing the project's tox.ini relative to the workspace. Empty works if tox.ini is at project root. (default: '') diff --git a/docs/jjb/lf-rtd-jobs.rst b/docs/jjb/lf-rtd-jobs.rst index c5c9172f..c983b58c 100644 --- a/docs/jjb/lf-rtd-jobs.rst +++ b/docs/jjb/lf-rtd-jobs.rst @@ -82,6 +82,8 @@ ReadTheDocs. To do that follow these steps: (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_merge_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths filter which checks which @@ -129,6 +131,8 @@ Verify job which runs a tox build of the docs project (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :gerrit_verify_triggers: Override Gerrit Triggers. :gerrit_trigger_file_paths: Override file paths filter which checks which diff --git a/docs/jjb/lf-whitesource-jobs.rst b/docs/jjb/lf-whitesource-jobs.rst index dd8fda30..641cfc3f 100644 --- a/docs/jjb/lf-whitesource-jobs.rst +++ b/docs/jjb/lf-whitesource-jobs.rst @@ -59,6 +59,8 @@ https://s3.amazonaws.com/unified-agent/wss-unified-agent.config (default: true) :submodule-timeout: Timeout (in minutes) for checkout operation. (default: 10) + :submodule-disable: Disable submodule checkout operation. + (default: false) :wss-unified-agent-version: WhiteSource Unified Agent version package to download and use. :gerrit_trigger_file_paths: Override file paths which used to filter which diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml index 2eb394ee..9dfc4473 100644 --- a/jjb/lf-c-cpp-jobs.yaml +++ b/jjb/lf-c-cpp-jobs.yaml @@ -28,6 +28,7 @@ sonarcloud-project-key: '' submodule-recursive: true submodule-timeout: 10 + submodule-disable: false ##################### # Job Configuration # @@ -89,6 +90,7 @@ refspec: '$GERRIT_REFSPEC' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -124,6 +126,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -158,6 +161,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false version: '' ##################### @@ -249,6 +253,7 @@ refspec: '$GERRIT_REFSPEC' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -284,6 +289,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -324,6 +330,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_verify_triggers: - patchset-created-event: @@ -391,6 +398,7 @@ refspec: '$GERRIT_REFSPEC' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -424,6 +432,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 5019cb98..b2eb383b 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -37,6 +37,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false packer-cloud-settings: packer-cloud-env packer-version: 1.4.0 @@ -113,6 +114,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false throttle_categories: [] throttle-enabled: false throttle-max-per-node: 1 @@ -186,6 +188,7 @@ git-url: '$GIT_URL/$GERRIT_PROJECT' stream: master submodule-timeout: 10 + submodule-disable: false gerrit_merge_triggers: - comment-added-contains-event: comment-contains-value: (un)?lock branch$ @@ -221,6 +224,7 @@ branch: '{branch}' submodule-recursive: false submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -278,6 +282,7 @@ github-url: 'https://github.com' jenkins-silos: production sandbox submodule-timeout: 10 + submodule-disable: false gerrit_merge_triggers: - change-merged-event @@ -339,6 +344,7 @@ branch: '{branch}' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -374,6 +380,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -414,6 +421,7 @@ github-url: 'https://github.com' openstack-cloud: vex submodule-timeout: 10 + submodule-disable: false gerrit_verify_triggers: - patchset-created-event: @@ -488,6 +496,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -519,6 +528,7 @@ branch: '$sha1' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -607,6 +617,7 @@ github-url: 'https://github.com' stream: master submodule-timeout: 10 + submodule-disable: false gerrit_jjb_deploy_job_triggers: - comment-added-contains-event: comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(jjb-deploy[:]* (?!\*+$).+$)' @@ -657,6 +668,7 @@ branch: '{branch}' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -695,6 +707,7 @@ branch: '$sha1' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -756,6 +769,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -796,6 +810,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -880,6 +895,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -920,6 +936,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -974,6 +991,7 @@ git-url: '$GIT_URL/$PROJECT' submodule-timeout: 10 + submodule-disable: false ##################### # Job Configuration # @@ -986,6 +1004,7 @@ branch: 'master' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1042,6 +1061,7 @@ spdx-disable: false stream: master submodule-timeout: 10 + submodule-disable: false ##################### # Job Configuration # @@ -1093,6 +1113,7 @@ # Submodules are out of the project's control submodule-recursive: false submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1134,6 +1155,7 @@ # Submodules are out of the project's control submodule-recursive: false submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1194,6 +1216,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1230,6 +1253,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1272,6 +1296,7 @@ openstack-volume-cleanup: true stream: master submodule-timeout: 10 + submodule-disable: false ##################### # Job Configuration # @@ -1365,6 +1390,7 @@ branch: '{branch}' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1380,6 +1406,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: true submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1449,6 +1476,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1506,6 +1534,7 @@ branch: '$GERRIT_REFSPEC' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1606,6 +1635,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1646,6 +1676,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1683,6 +1714,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -1754,6 +1786,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -1791,6 +1824,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-info-vote.yaml b/jjb/lf-info-vote.yaml index 3c421aa6..57dc63b6 100644 --- a/jjb/lf-info-vote.yaml +++ b/jjb/lf-info-vote.yaml @@ -47,6 +47,7 @@ disable-job: false git-url: '$GIT_URL/$PROJECT' submodule-timeout: 10 + submodule-disable: false submodule-recursive: true gerrit-skip-vote: false @@ -85,6 +86,7 @@ refspec: '$GERRIT_REFSPEC' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index e3933930..6804f482 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -577,6 +577,7 @@ skip-tag: true wipe-workspace: true submodule: + disable: '{submodule-disable}' recursive: '{submodule-recursive}' timeout: '{submodule-timeout}' choosing-strategy: '{choosing-strategy}' @@ -593,6 +594,7 @@ skip-tag: true wipe-workspace: true submodule: + disable: '{submodule-disable}' recursive: '{submodule-recursive}' timeout: '{submodule-timeout}' choosing-strategy: '{choosing-strategy}' diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 2e352458..349ad64e 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -150,6 +150,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false nexus_iq_scan_patterns: - '**/*.ear' @@ -220,6 +221,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -260,6 +262,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -304,6 +307,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_merge_triggers: - change-merged-event @@ -351,6 +355,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -385,6 +390,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -430,6 +436,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_verify_triggers: - patchset-created-event: @@ -476,6 +483,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -509,6 +517,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -550,6 +559,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_merge_triggers: - change-merged-event @@ -615,6 +625,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -650,6 +661,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -724,6 +736,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -760,6 +773,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -814,6 +828,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_release_triggers: - comment-added-contains-event: @@ -896,6 +911,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -930,6 +946,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1002,6 +1019,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -1038,6 +1056,7 @@ branch: '{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1083,6 +1102,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_sonar_triggers: - comment-added-contains-event: @@ -1222,6 +1242,7 @@ branch: $GERRIT_BRANCH submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default - job-template: @@ -1244,6 +1265,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1288,6 +1310,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_verify_triggers: - patchset-created-event: @@ -1347,6 +1370,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -1381,6 +1405,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1443,6 +1468,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -1479,6 +1505,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -1519,6 +1546,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_verify_triggers: - comment-added-contains-event: @@ -1572,6 +1600,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml index 21f0fb5a..b1e0cbd1 100644 --- a/jjb/lf-node-jobs.yaml +++ b/jjb/lf-node-jobs.yaml @@ -21,6 +21,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -95,6 +96,7 @@ branch: 'origin/$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -127,6 +129,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index dfd4d34f..8240845c 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -81,6 +81,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_trigger_file_paths: - compare-type: ANT @@ -145,6 +146,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -186,6 +188,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -229,6 +232,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -327,6 +331,7 @@ branch: $GERRIT_BRANCH submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -367,6 +372,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -403,6 +409,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false tox-dir: '' tox-envs: '' @@ -485,6 +492,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: gerrit triggers: @@ -518,6 +526,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 9f686e2a..110f4ba4 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -168,6 +168,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false gerrit-skip-vote: false gerrit_verify_triggers: @@ -206,6 +207,7 @@ refspec: '' # Leave blank!! A later script will handle fetching submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -246,6 +248,7 @@ branch: '$sha1' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/jjb/lf-whitesource-jobs.yaml b/jjb/lf-whitesource-jobs.yaml index b7c3672e..8fade15b 100644 --- a/jjb/lf-whitesource-jobs.yaml +++ b/jjb/lf-whitesource-jobs.yaml @@ -99,6 +99,7 @@ stream: master submodule-recursive: true submodule-timeout: 10 + submodule-disable: false wss-unified-agent-opts: '' wss-unified-agent-version: 19.2.2.2 @@ -176,6 +177,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default triggers: @@ -217,6 +219,7 @@ branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' + submodule-disable: '{submodule-disable}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' diff --git a/releasenotes/notes/submodule-disable-007e41e593d9b11c.yaml b/releasenotes/notes/submodule-disable-007e41e593d9b11c.yaml new file mode 100644 index 00000000..5a2774b3 --- /dev/null +++ b/releasenotes/notes/submodule-disable-007e41e593d9b11c.yaml @@ -0,0 +1,16 @@ +--- +features: + - | + **lf-infra-gerrit-scm** and **lf-infra-github-scm** now require a + ``submodule-disable`` parameter (bool) to control whether submodules + are ignored or not during git fetch operations. + - | + All job-templates now provide an optional ``submodule-disable`` parameter + for git fetch operations, defaulting to ``false``. + +upgrade: + - | + Any project using the **lf-infra-gerrit-scm** and **lf-infra-github-scm** + macros in global-jjb should need to add a ``submodule-disable`` value. It + is recommended to default this value to ``false`` since it is the + default used by the Jenkins Git Plugin. -- 2.16.6