diff options
| -rw-r--r-- | jjb/global/releng-macros.yml | 11 | ||||
| -rw-r--r-- | jjb/releng/releng-ci-jobs.yml | 27 |
2 files changed, 13 insertions, 25 deletions
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 5b403ab2c..1ff4799ab 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -121,6 +121,17 @@ choosing-strategy: 'gerrit' refspec: '$GERRIT_REFSPEC' <<: *git-scm-defaults + +- scm: + name: git-scm-gerrit-with-submodules + scm: + - git: + choosing-strategy: 'gerrit' + refspec: '$GERRIT_REFSPEC' + submodule: + recursive: true + timeout: 20 + <<: *git-scm-defaults - scm: name: git-scm-with-submodules scm: diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml index 6fb6804bc..5420406cd 100644 --- a/jjb/releng/releng-ci-jobs.yml +++ b/jjb/releng/releng-ci-jobs.yml @@ -4,7 +4,6 @@ jobs: - 'releng-verify-jjb' - 'releng-merge-jjb' - - 'releng-comment-jjb' project: 'releng' @@ -17,7 +16,7 @@ branch: 'master' scm: - - git-scm-gerrit + - git-scm-gerrit-with-submodules triggers: - gerrit: @@ -57,28 +56,6 @@ - email-jenkins-admins-on-failure - job-template: - name: releng-comment-jjb - - parameters: - - project-parameter: - project: '{project}' - branch: 'master' - - scm: - - git-scm-gerrit - - triggers: - - experimental: - project: '{project}' - branch: 'master' - files: 'jjb/**' - - builders: - - shell: - !include-raw-escape: generate-job-list.sh - - report-build-result-to-gerrit - -- job-template: name: 'releng-merge-jjb' # builder-merge job to run JJB update @@ -97,7 +74,7 @@ option: 'project' scm: - - git-scm + - git-scm-with-submodules triggers: - gerrit: |