v1a5 will be tracked as main integration test

v1a4 will be trackes as v1a4-integration test

Change-Id: I3e131cea9664d2fbcd37b2761be184639b3aa818

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 1d8288cf7a8dc0d29109d4d1ade774667abbcb11..238b91e3f57c17a869a23a0ea5fdffe926ad6545 100644 (file)
--- 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-centos-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a4-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-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 45e521200a3ddbe059cf7d17d8db3a055347afb7..671345d006a354133128e7b3f34ddf751b0eaf80 100644 (file)
--- 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-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a4-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-integration"
+        status-context: "test-v1a4-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 c54b2c39c68ea358718e6b2a0a90cfc250c092a2..3929242febb282f3ebfb40c6aa478915b3cbbe1b 100644 (file)
--- 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-v1a5-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
@@ -99,7 +99,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-        status-context: "test-v1a5-centos-integration"
+        status-context: "test-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 de7e4b657ea3c2d5e95b14a79ad4c13beccc745c..90290a216972387465cde6b55e1eac1689411ba9 100644 (file)
--- 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-v1a5-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-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-v1a5-integration"
+        status-context: "test-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"