diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-02-08 15:34:43 -0800 |
|---|---|---|
| committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-02-08 15:34:43 -0800 |
| commit | 453ba6949e2763d6067c03a5af7d6a97dd910147 (patch) | |
| tree | 6284596e6baf41c9701244533673988590627ba8 /jjb/toolchain_test | |
| parent | dfbc88c5cd0be065fe7722efeae20c0ff6f42cdd (diff) | |
Finish converting toolchain_test to zuul
* Migrate toolchain_test-merge to using zuul
* update toolchain_test-verify to use new scm macro
* drop the project and branch parameters as zuul doesn't honor them
anyway
Change-Id: I678bcc3c19477fa245de99d5bc4d09d822339e09
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb/toolchain_test')
| -rw-r--r-- | jjb/toolchain_test/toolchain_test-custom.yaml | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/jjb/toolchain_test/toolchain_test-custom.yaml b/jjb/toolchain_test/toolchain_test-custom.yaml index 527b70853..6d0cc9efd 100644 --- a/jjb/toolchain_test/toolchain_test-custom.yaml +++ b/jjb/toolchain_test/toolchain_test-custom.yaml @@ -19,21 +19,10 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - scm: - - git: + - zuul-trigger-scm: credentials-id: '{ssh-credentials}' - url: '$ZUUL_URL/$ZUUL_PROJECT' refspec: '$ZUUL_REF' - branches: - - 'origin/$ZUUL_BRANCH' - skip-tag: true - wipe-workspace: true wrappers: - ssh-agent-credentials: @@ -56,28 +45,16 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - scm: - - gerrit-trigger-scm: + - zuul-trigger-scm: credentials-id: '{ssh-credentials}' refspec: '' - choosing-strategy: 'default' wrappers: - ssh-agent-credentials: users: - '{ssh-credentials}' - triggers: - - gerrit-trigger-patch-merged: - name: '{project}' - branch: '{branch}' - builders: - shell: !include-raw-escape include-raw-toolchain_test-build.sh |