From 4426dc641b5fe74ace741e26d160c9668f2048fa Mon Sep 17 00:00:00 2001 From: Nauman Yaseen Date: Wed, 21 Feb 2024 13:49:40 +0000 Subject: [PATCH] Change metal3 jobs trigger phrase pattern Change-Id: If433df048028e4bb34c560ff029290305dff2d82 --- jjb/metal3/job_bml_integration_tests.yml | 2 +- jjb/metal3/job_capm3_e2e_basic_tests.yml | 2 +- jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml | 2 +- jjb/metal3/job_capm3_e2e_feature_tests.yml | 2 +- jjb/metal3/job_capm3_e2e_integration_tests.yml | 2 +- jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml | 2 +- jjb/metal3/job_fullstack_building_test.yml | 2 +- jjb/metal3/job_fullstack_project-infra_building_test.yml | 2 +- jjb/metal3/job_integration_tests.yml | 2 +- jjb/metal3/job_ironic_image_build_test.yml | 2 +- jjb/metal3/job_keep_capm3_e2e_basic_tests.yml | 2 +- jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml | 2 +- jjb/metal3/job_keep_capm3_e2e_feature_tests.yml | 2 +- jjb/metal3/job_keep_capm3_e2e_integration_tests.yml | 2 +- jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml | 2 +- jjb/metal3/job_keep_integration_vm.yml | 2 +- jjb/metal3/job_metal3_dev_tools_integration_test.yml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml index 6ffeebea8..72c3c407d 100644 --- 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 3234a6fe5..a2071ef68 100644 --- 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 eb9a6fae8..7a4e7d023 100644 --- 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 362448fad..d48e7f968 100644 --- 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 34c098340..995dbb49b 100644 --- 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 1198ef384..c85d5b1ef 100644 --- 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 5956785e3..918ce98d2 100644 --- 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 b5aa3bc89..118bf62e5 100644 --- 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 15dae130d..030d4c45e 100644 --- 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 cbe2f2e2a..8b9412f3e 100644 --- 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 e44b0c558..5536dc1fb 100644 --- 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 93380983e..d54ec8c45 100644 --- 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 8fa914ee1..a68893cff 100644 --- 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 b88e68f91..ddb9e7cce 100644 --- 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 b08ca1a7a..89a991060 100644 --- 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 946d3b46c..e2ed626ae 100644 --- 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 52108557e..031698a9d 100644 --- 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 -- 2.25.1