Merge "Correction in script for building longbow docs"

[ci-management.git] / jjb / global-macros.yaml

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 7f86c38..f4b5780 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -135,14 +135,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 +171,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
@@ -219,6 +194,55 @@
                     - 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: 'false'
+                    exclude-trivial-rebase: 'true'
+                    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-trivial-patch-submitted-skip-vote
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'true'
+                    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:
@@ -278,7 +302,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: |