From: Maël Kimmerlin <mael.kimmerlin@est.tech>
Date: Tue, 14 Jan 2020 10:26:50 +0000 (+0000)
Subject: Merge "airship update upstream test status"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=bbe2b5e193f2b70770ce4c104455c7f5f03e6c4b;hp=d16d90a3d674f276089b9854069c64f5c99cd0b8;p=infra%2Fcicd.git

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 2f5e1fc2..4620926c 100644
--- 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 ed2f2415..02467b1d 100644
--- 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 1a6ed425..66dba364 100644
--- 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 683afe53..41837d31 100644
--- 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"