diff options
| author |   Eric Ball <eball@linuxfoundation.org> | 2018-09-28 13:08:13 -0700 |
|---|---|---|
| committer | Eric Ball <eball@linuxfoundation.org> | 2018-09-28 13:45:18 -0700 |
| commit | 272a5c455974c7fd51b610a994810b268e5aa5d0 (patch) | |
| tree | 6397b47e0395113d1f4737629e2c6738c9451c56 | |
| parent | 8e74e612c8d22a70e433ff7f034c0c11ec96978b (diff) | |
Update ci-management submodules recursively
To enable compatibility with global-jjb, the scm needs to update
submodules recursively. Adding the param to the old scm would
require changing every reference to that object, so a new scm was
created.
Change-Id: Ib514d06891f50a24bb2f38449b5b094db602f7e6
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
| -rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 12 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 14 |
2 files changed, 22 insertions, 4 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index cef4c9b1e..0139f164a 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -35,10 +35,11 @@ project: '{project}' scm: - - gerrit-trigger-scm: + - gerrit-trigger-scm-recursive: credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' + submodule-recursive: true wrappers: - fdio-infra-wrappers: @@ -78,10 +79,11 @@ project: '{project}' scm: - - gerrit-trigger-scm: + - gerrit-trigger-scm-recursive: credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: true wrappers: - fdio-infra-wrappers: @@ -128,6 +130,7 @@ branches: - '$GERRIT_BRANCH' choosing-strategy: 'gerrit' + submodule-recursive: true wrappers: - fdio-infra-wrappers: @@ -197,6 +200,7 @@ branches: - '$GERRIT_BRANCH' choosing-strategy: 'default' + submodule-recursive: true wrappers: - fdio-infra-wrappers: diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 8bca2e067..92c881fb9 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -156,6 +156,20 @@ choosing-strategy: '{choosing-strategy}' - scm: + name: gerrit-trigger-scm-recursive + scm: + - git: + credentials-id: '{credentials-id}' + url: '$GIT_BASE' + refspec: '{refspec}' + branches: + - 'origin/$GERRIT_BRANCH' + skip-tag: true + choosing-strategy: '{choosing-strategy}' + submodule: + recursive: '{submodule-recursive}' + +- scm: name: zuul-trigger-scm scm: - git: |