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
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 238b91e..1d8288c 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 671345d..45e5212 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 3929242..c54b2c3 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 90290a2..de7e4b6 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"