Change metal3 jobs trigger phrase pattern

Change-Id: If433df048028e4bb34c560ff029290305dff2d82

diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml
index 6ffeebea84a049bb56a281743dc23e9d20ebdf70..72c3c407d05ccafb5fb67b16028876b7227be947 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests.yml
+++ b/jjb/metal3/job_bml_integration_tests.yml
@@ -104,7 +104,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-bml-{image_os}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-integration-bml-{image_os}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index 3234a6fe507340eab7ac631cfde1e598c6ff9e23..a2071ef68ea57722c589c2bda0af3c485681c7be 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -126,7 +126,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-basic-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-e2e-basic-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
index eb9a6fae86a90fdebbdcbc59edf08b68f582c2b2..7a4e7d0232d21d9c561636864bee2f8691d74dfe 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
@@ -106,7 +106,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-e2e-upgrade-main-{upgrade_from_release}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-e2e-upgrade-main-{upgrade_from_release}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_capm3_e2e_feature_tests.yml b/jjb/metal3/job_capm3_e2e_feature_tests.yml
index 362448fadc2d1ed73a0c0e269782ba3b4c11b6dd..d48e7f968bab8d212a03720b4aa359ecbca05f35 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_feature_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_feature_tests.yml
@@ -102,7 +102,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-feature-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-e2e-feature-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_capm3_e2e_integration_tests.yml b/jjb/metal3/job_capm3_e2e_integration_tests.yml
index 34c0983404acb5f95edb55255aa53f4ce9f5f6a8..995dbb49b7435a35dc46bd1a306aa4c65bbbd706 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_integration_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_integration_tests.yml
@@ -102,7 +102,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-integration-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-e2e-integration-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
index 1198ef384121669521e34ec3268bcdbae661e324..c85d5b1ef1d4d7865957cc5fa8976beeeda325f9 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
@@ -114,7 +114,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '(\n|\A)\/test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}\s*(\r|\n|\Z)'
+        trigger-phrase: '.*?/test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_fullstack_building_test.yml b/jjb/metal3/job_fullstack_building_test.yml
index 5956785e35dfe0f5ffaa7534a50346afeead3cae..918ce98d2a863fad08812d26df9460e84721596c 100644 (file)
--- a/jjb/metal3/job_fullstack_building_test.yml
+++ b/jjb/metal3/job_fullstack_building_test.yml
@@ -190,7 +190,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-metal3-fullstack(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-metal3-fullstack.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_fullstack_project-infra_building_test.yml b/jjb/metal3/job_fullstack_project-infra_building_test.yml
index b5aa3bc89ade1d21f417a40f5273a70fa6e26de1..118bf62e5d72cb5475aca5433fa85b74be1f39ee 100644 (file)
--- a/jjb/metal3/job_fullstack_project-infra_building_test.yml
+++ b/jjb/metal3/job_fullstack_project-infra_building_test.yml
@@ -190,7 +190,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-metal3-fullstack(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-metal3-fullstack.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index 15dae130dd98564053794eba2af3005f72f00806..030d4c45e215f424c9b7b7ae812e58477eda7ea3 100644 (file)
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -104,7 +104,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-integration-{capm3_target_branch}{trigger_postfix}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-integration-{capm3_target_branch}{trigger_postfix}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_ironic_image_build_test.yml b/jjb/metal3/job_ironic_image_build_test.yml
index cbe2f2e2ac160d09753a88cc0f5f0512108120a2..8b9412f3e86141614490ead27edbe536e4ba4a3d 100644 (file)
--- a/jjb/metal3/job_ironic_image_build_test.yml
+++ b/jjb/metal3/job_ironic_image_build_test.yml
@@ -73,7 +73,7 @@
           - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-ironic-image-build(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-ironic-image-build.*?'
         cron: 'H/5 * * * *'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml b/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
index e44b0c55859eee964c748721e2236737c832f481..5536dc1fb6f9d64ef0bb6acfc222fc0d7e31b171 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
@@ -106,7 +106,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-basic-main(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-e2e-basic-main.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
index 93380983e88a244a652a91f78f80c439e6f64a2d..d54ec8c455ae8b5d77a375eff14b036260cf39be 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
@@ -110,7 +110,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-e2e-upgrade-main-{upgrade_from_release}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-e2e-upgrade-main-{upgrade_from_release}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml b/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
index 8fa914ee1dc167348c75fc93143f02f0cc7371be..a68893cff60e014cdbc4f0bed2acb46c91b31d8b 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
@@ -105,7 +105,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-feature-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-e2e-feature-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml b/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
index b88e68f9165b3ddb499824a57207d4d0b8628f6b..ddb9e7ccecefc4a2c3899d62e929196e812fcbd0 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
@@ -106,7 +106,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-integration-main(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-e2e-integration-main.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
index b08ca1a7a9f6c2e10673e2b1d3accae9799b8b4c..89a991060a35f46913fc0e86f3dc4c1e399147f9 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
@@ -118,7 +118,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml
index 946d3b46c47e1411a58167ba372b18a2896363c6..e2ed626ae30f59d6bac3bb6d132949007e751970 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm.yml
+++ b/jjb/metal3/job_keep_integration_vm.yml
@@ -99,7 +99,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-integration-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-integration-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
index 52108557e4b6b8c4d6e969a4f683f18be20c0c2e..031698a9de45f426de25862c33562d0644e05b25 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
@@ -91,7 +91,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-dev-tools-{image_os}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-integration-metal3-dev-tools-{image_os}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True