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>

diff --git a/jjb/toolchain_test/toolchain_test-custom.yaml b/jjb/toolchain_test/toolchain_test-custom.yaml
index 527b708..6d0cc9e 100644 (file)
--- 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