X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=25749b388a528fbb683a64cb0eb3aa6b42723ef1;hb=c9368b4395a096cd5d7149fbe8cfde727ef16585;hp=6487231cb84ca48bb13e9cf97eb8ef653037bec7;hpb=a65451bc04b40633e89fe507fc119b9a65cc96a4;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 6487231cb..25749b388 100644
--- 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:
@@ -466,9 +454,8 @@
                 - UNSTABLE
               build-steps:
                 - shell: |
-                    #!/bin/bash
+                    #!/bin/bash -l
                     echo "Deleting $STACK_NAME"
-                    source "/tmp/v/openstack/bin/activate"
                     openstack stack delete --yes "$STACK_NAME"
           mark-unstable-if-failed: false