From: maelk <mael.kimmerlin@est.tech>
Date: Mon, 1 Jun 2020 20:08:52 +0000 (+0300)
Subject: airship update regex to expand ghprb trigger matching
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=2b3c75211ddbc5a33a2c131173f7f827e8edb63f;p=infra%2Fcicd.git

airship update regex to expand ghprb trigger matching

That allows triggers to be part of a comment, and not in a
standalone comment anymore

Change-Id: I35cc31bd88ec487baf37308e2480154e9c8a2391
---

diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml
index 17366376..59584aff 100644
--- a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml
@@ -86,13 +86,13 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-centos-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-centos-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml
index a9935101..e382bf42 100644
--- a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml
@@ -86,13 +86,13 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
index bdceb3b8..7b48b62f 100644
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
@@ -86,17 +86,17 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a4-centos-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a4-centos-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
-        status-context: "test-centos-integration"
+        status-context: "test-v1a4-centos-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
index daff766a..dc4d19b3 100644
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@ -86,13 +86,13 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a4-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a4-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'