diff options
Diffstat (limited to 'jjb/ci-management/ci-management-jobs.yaml')
| -rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index 06bcb75ad..30990e802 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -3,10 +3,9 @@ jobs: - 'ci-management-verify-jjb' - 'ci-management-merge-jjb' - - 'ci-management-verify-zuul' - - 'ci-management-merge-zuul' - - 'ci-management-verify-nodepool' - - 'ci-management-merge-nodepool' + + project: ci-management + branch: master - job-template: name: ci-management-verify-jjb @@ -21,17 +20,26 @@ artifactDaysToKeep: -1 artifactNumToKeep: 5 + parameters: + - project-parameter: + project: '{project}' + scm: - - zuul-trigger-scm: + - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - refspec: '$ZUUL_REF' - commit: '$ZUUL_COMMIT' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - ssh-agent-credentials: users: - '{ssh-credentials}' + triggers: + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' + builders: - shell: | jenkins-jobs test --recursive -o job_output jjb/ @@ -53,17 +61,26 @@ artifactDaysToKeep: -1 artifactNumToKeep: 5 + parameters: + - project-parameter: + project: '{project}' + scm: - - zuul-trigger-scm: + - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - refspec: '' - commit: 'origin/$ZUUL_BRANCH' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - ssh-agent-credentials: users: - '{ssh-credentials}' + triggers: + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' + builders: - shell: !include-raw-escape: include-raw-jjb-update.sh |