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 1736637644b171c18e017aa127a6433dc56cd88a..59584aff94b2fac91e5febc9de1ac184e33d1b77 100644 (file)
--- 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 a99351017336c2af929103d5764c56663611c363..e382bf4277daa5dfed6e02f0721f301eba6fd789 100644 (file)
--- 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 bdceb3b8a66e68cd130bfba7424ddc7eb3056a27..7b48b62ff414fe92f3a56ab941d8830ea5d9bcad 100644 (file)
--- 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 daff766a233b73b47247bf28bb2dbe84e712a097..dc4d19b3cd9923def9e2fa1398f9b752683b27c7 100644 (file)
--- 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'