From c77986c497cbe47726ee3987f66704c4a9283435 Mon Sep 17 00:00:00 2001 From: kashifest Date: Tue, 8 Jun 2021 09:03:55 +0300 Subject: [PATCH] Keep test integration trigger to v1a4 jobs This PR makes sure that the v1a4 jobs are trigerred when test-integration is trigerred, since v1a5 is not ready yet to be tested. To test v1a5 we should use test-v1a5-integration until there is a release. Change-Id: Ib8991ef2d7a7fecfd3762bf753af51901cbd8dd5 --- jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml | 4 ++-- jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml | 4 ++-- jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml | 4 ++-- jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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 238b91e3..1d8288cf 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml @@ -90,7 +90,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '((.|\n)*\s)?/test-v1a4-centos-integration(\s(.|\n)*)?' + trigger-phrase: '((.|\n)*\s)?/test-centos-integration(\s(.|\n)*)?' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -101,7 +101,7 @@ - 'master' - 'release-0.4' - 'release-0.0' - status-context: "test-v1a4-centos-integration" + status-context: "test-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 671345d0..45e52120 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml @@ -90,7 +90,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '((.|\n)*\s)?/test-v1a4-integration(\s(.|\n)*)?' + trigger-phrase: '((.|\n)*\s)?/test-integration(\s(.|\n)*)?' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -101,7 +101,7 @@ - 'master' - 'release-0.4' - 'release-0.0' - status-context: "test-v1a4-integration" + status-context: "test-integration" success-status: "Passed" failure-status: "Failed" error-status: "Error" diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml index 3929242f..c54b2c39 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml @@ -90,7 +90,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '((.|\n)*\s)?/test-centos-integration(\s(.|\n)*)?' + trigger-phrase: '((.|\n)*\s)?/test-v1a5-centos-integration(\s(.|\n)*)?' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -99,7 +99,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' - status-context: "test-centos-integration" + status-context: "test-v1a5-centos-integration" success-status: "Passed" failure-status: "Failed" error-status: "Error" diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml index 90290a21..de7e4b65 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml @@ -90,7 +90,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '((.|\n)*\s)?/test-integration(\s(.|\n)*)?' + trigger-phrase: '((.|\n)*\s)?/test-v1a5-integration(\s(.|\n)*)?' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -99,7 +99,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' - status-context: "test-integration" + status-context: "test-v1a5-integration" success-status: "Passed" failure-status: "Failed" error-status: "Error" -- 2.25.1