Merge "Fix HAPROXY ${i} index to be just '1'"

[releng/builder.git] / jjb / releng-macros.yaml

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 7ae65fe2a6b2fc7d8e9c03cdd5a2966c2fb7bf6a..7474697d7e06d3f6da44f1c9584ab50e34c97c5a 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -208,7 +208,7 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: 'recheck$'
+                comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -218,6 +218,9 @@
               file-paths:
                 - compare-type: ANT
                   pattern: '{files}'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: '{forbidden-files}'
 
 # TODO: Unify argument names across gerrit-trigger-* macros.
 - trigger:
@@ -235,6 +238,12 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: '{files}'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: '{forbidden-files}'
           skip-vote:
             successful: true
             failed: true
@@ -254,27 +263,6 @@
           gerrit-build-unstable-codereview-value: 0
           gerrit-build-notbuilt-codereview-value: 0
 
-# TODO: Unify argument names across gerrit-trigger-* macros.
-- trigger:
-    name: gerrit-trigger-patch-sonar
-    triggers:
-      - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-sonar'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{name}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
 - publisher:
     name: email-notification
     publishers:
@@ -358,24 +346,6 @@
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
-- builder:
-    name: opendaylight-infra-push-gerrit-patch
-    # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to
-    # Gerrit in an automated fashion. This is meant for tasks that creates
-    # the same patch regularly and needs the ability to detect if an unreviewed
-    # patch already exists. In which case it will update the existing patch.
-    #
-    # Note: This patch assumes the $WORKSPACE contains the project repo with
-    #       the files changed already "git add" and waiting for a "git commit" call.
-    #
-    # This script requires the following JJB variables to be passed in:
-    #     {project}       Gerrit project-name
-    #     {gerrit-topic}  Gerrit topic, please make a unique topic.
-    #     {gerrit-commit-message} Commit message to assign to commit.
-    # NOTE: Requires git review to be installed on node.
-    builders:
-      - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh
-
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.