X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=7d672571ae8c66f7d9f3fc97375d21c9a559b03f;hb=e621897737bcfe66377cb0c66a56fbab05351740;hp=be96bd9bf69f42d994530700791e37f3028978da;hpb=33685940c9e963333163b09876f3f257478bdadc;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index be96bd9bf..7d672571a 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -89,6 +89,46 @@
             default: '{stream}'
             description: "Stream job parameter to be used in shell scripts."
 
+- parameter:
+    name: topo-parameter
+    parameters:
+        - string:
+            name: TOPO
+            default: '{topo}'
+            description: "Topology parameter"
+
+- parameter:
+    name: arch-parameter
+    parameters:
+        - string:
+            name: ARCH
+            default: '{arch}'
+            description: "Architecture parameter"
+
+- parameter:
+    name: gerrit-event-type-parameter
+    parameters:
+        - string:
+            name: GERRIT_EVENT_TYPE
+            default: ''
+            description: "GERRIT_EVENT_TYPE parameter not given by trigger"
+
+- parameter:
+    name: gerrit-event-comment-text-parameter
+    parameters:
+        - string:
+            name: GERRIT_EVENT_COMMENT_TEXT
+            default: ''
+            description: "GERRIT_EVENT_COMMENT_TEXT parameter not given by trigger"
+
+- parameter:
+    name: gerrit-csit-refspec-parameter
+    parameters:
+        - string:
+            name: CSIT_REF
+            default: ''
+            description: "GERRIT_REFSPEC parameter to override separately cloned CSIT repository, leave empty for autodetection / no override."
+            # FIXME: Wrap long lines.
 
 ##### SCMS
 - scm:
@@ -115,6 +155,20 @@
             skip-tag: true
             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:
@@ -179,7 +233,7 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'false'
                 - draft-published-event
@@ -201,8 +255,8 @@
             server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'true'
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
@@ -216,6 +270,50 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
 
+- trigger:
+    name: gerrit-trigger-os-trivial-patch-submitted
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'os-check'
+                - comment-added-contains-event:
+                    comment-contains-value: 'os-verify'
+            projects:
+                - project-compare-type: 'ANT'
+                  project-pattern: '{name}'
+                  branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+
+- trigger:
+    name: gerrit-trigger-trivial-patch-submitted-skip-vote
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+                - project-compare-type: 'ANT'
+                  project-pattern: '{name}'
+                  branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
 - trigger:
     name: gerrit-trigger-manually-triggered
     triggers:
@@ -260,6 +358,34 @@
             gerrit-build-unstable-codereview-value: 0
             gerrit-build-notbuilt-codereview-value: 0
 
+- trigger:
+    name: gerrit-trigger-os-patch-merged
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'os-merge'
+            projects:
+                - project-compare-type: 'ANT'
+                  project-pattern: '{name}'
+                  branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+            # Force Jenkins always vote the values it should already have voted
+            # during the prior verify phase
+            override-votes: true
+            gerrit-build-started-verified-value: 1
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 1
+            gerrit-build-unstable-verified-value: 1
+            gerrit-build-notbuilt-verified-value: 1
+            gerrit-build-started-codereview-value: 0
+            gerrit-build-successful-codereview-value: 0
+            gerrit-build-failed-codereview-value: 0
+            gerrit-build-unstable-codereview-value: 0
+            gerrit-build-notbuilt-codereview-value: 0
+
 # Publishers
 - publisher:
     name: archive-artifacts
@@ -326,19 +452,25 @@
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw: include-raw-deploy-archives.sh
-            - maven-target:
-                maven-version: '{maven-version}'
-                pom: '.archives/deploy-archives.xml'
-                goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
-                settings: 'jenkins-log-archives-settings'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-            - description-setter:
-                regexp: '^Build logs: .*'
-          script-only-if-succeeded: false
-          script-only-if-failed: false
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - shell: !include-raw: include-raw-deploy-archives.sh
+                - maven-target:
+                    maven-version: '{maven-version}'
+                    pom: '.archives/deploy-archives.xml'
+                    goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
+                    settings: 'jenkins-log-archives-settings'
+                    settings-type: cfp
+                    global-settings: 'global-settings'
+                    global-settings-type: cfp
+                - description-setter:
+                    regexp: '^Build logs: .*'
           mark-unstable-if-failed: true
       - workspace-cleanup:
           fail-build: false