X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-macros.yaml;h=92c881fb9a6e1661bf5ec330490ce8749624a4e9;hb=c323e77475015fa055e67138fb63e0baaf2af747;hp=7f86c383166a3b8cc3d465f34b05e4cb6c07dd9c;hpb=7c6b60f0acf4abaae12bd16c8975c4b4cc96dc64;p=ci-management.git

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 7f86c3831..92c881fb9 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:
@@ -135,14 +189,6 @@
             timeout: 360
             fail: true
 
-- wrapper:
-    name: build-perf-timeout
-    wrappers:
-        - timeout:
-            type: no-activity
-            timeout: 2880
-            fail: true
-
 - wrapper:
     # This wrapper is used for all jobs that require no-activity timeouts
     name: fdio-infra-wrappers-non-activity-timeout
@@ -179,23 +225,6 @@
       - openstack:
           single-use: True
 
-- wrapper:
-    # This wrapper is used for all performence jobs that require timeouts
-    name: fdio-infra-wrappers-build-perf-timeout
-    wrappers:
-      - timeout:
-          type: no-activity
-          timeout: '{build-perf-timeout}'
-          fail: true
-      - timestamps
-      - ssh-agent-credentials:
-          users:
-            - 'jenkins-gerrit-credentials'
-      - jclouds:
-          single-use: True
-      - openstack:
-          single-use: True
-
 ###### TRIGGERS
 - trigger:
     name: gerrit-trigger-patch-submitted
@@ -204,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
@@ -219,6 +248,72 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
 
+- trigger:
+    name: gerrit-trigger-trivial-patch-submitted
+    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}'
+
+- 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:
@@ -263,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
@@ -278,7 +401,7 @@
     publishers:
         - email-ext:
             recipients: 'nobody@projectrotterdam.info'
-            reply-to:
+            reply-to: ''
             content-type: default
             subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
             body: |