Merge "airship update upstream test status"

diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml
index 2f5e1fc211fae74b9ace42eec8c40d808bd02910..4620926c054e764a4b2540537b9cdf1e814aa987 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml
@@ -78,7 +78,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a1-centos-integration'
+        trigger-phrase: '/test-centos-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: False
@@ -88,7 +88,7 @@
         white-list-target-branches:
           - 'master'
           - 'v1alpha1'
-        status-context: "integration-tests-centos"
+        status-context: "test-centos-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"

diff --git a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
index ed2f24159774e962ed9111e3f96d545a9dab54a9..02467b1d68e53662cb4e3667eed9be526e10b667 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
@@ -78,7 +78,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a1-integration'
+        trigger-phrase: '/test-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: False
@@ -88,7 +88,7 @@
         white-list-target-branches:
           - 'master'
           - 'v1alpha1'
-        status-context: "integration-tests-ubuntu"
+        status-context: "test-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"

diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
index 1a6ed425b721cee1dcc55ece7410d221c71c0e5e..66dba36474bc651a8bf096df9b1731dc317c6d03 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
@@ -78,7 +78,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-centos-integration'
+        trigger-phrase: '/test-v1a2-centos-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: False
@@ -87,8 +87,8 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'v1alpha1'
-        status-context: "v1a2-integration-tests-centos"
+          - 'v1alpha2'
+        status-context: "test-v1a2-centos-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"

diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
index 683afe5391f39e1e5b1cf042333617019cd81b2e..41837d3157d7e305891b63e0f72e5b7f8d6cc6ee 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
@@ -78,7 +78,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-integration'
+        trigger-phrase: '/test-v1a2-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: False
@@ -87,8 +87,8 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'v1alpha1'
-        status-context: "v1a2-integration-tests-ubuntu"
+          - 'v1alpha2'
+        status-context: "test-v1a2-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"