commit c249e7663c9bce2adb3e66a90afbf34122b6796e
author Filip Pytloun <fpytloun@mirantis.com> Thu Jun 22 12:52:39 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jun 22 12:52:41 2017 +0000
tree 5b32f95a12be042ee6e52cc1d15a081edd514904
parent 2daba013e0385687b7abd5ed1fae19a77c383e1c
parent acb91cb4ab50d688a44a902b255241999c38d4d6

Merge "Changed salt-formulas and salt-models automatic tests triggering policy."

jenkins/client/job/opencontrail/build/test.yml

diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 9b66e60..0d1f7bf 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -63,11 +63,8 @@
                       - "{{branch}}"
                 event:
                  comment:
-                    - added:
-                        verdictCategory: 'Code-Review'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               TEST_MODELS:
                 type: string

jenkins/client/job/salt-formulas/tests.yml

diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 60f4f3f..a1147e7 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -135,11 +135,8 @@
                       - master
                 event:
                   comment:
-                    - added:
-                        verdictCategory: 'Code-Review'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               SALT_VERSION:
                 type: string

jenkins/client/job/salt-models/tests.yml

diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 711cdf7..70b85b0 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -23,11 +23,8 @@
                         name: "{{branch}}"
                 event:
                   comment:
-                    - added:
-                        verdictCategory: 'Code-Review'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               SALT_OPTS:
                 type: string
@@ -108,11 +105,8 @@
                       - master
                 event:
                   comment:
-                    - added:
-                        verdictCategory: 'CodeReview'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               COOKIECUTTER_TEMPLATE_URL:
                 type: string