Separate github and ghprb credentials in airship jobs

update github token for ghprb

Change-Id: I12b10e6a1da467500519028e88f373f41265cabc

diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml
index 1d4a9ed088474857fee238b0b74b1b0010905aa7..8e1f829fca16b71079532131f0d2e73f3bb60947 100644 (file)
--- a/jjb/airship/defaults.yml
+++ b/jjb/airship/defaults.yml
@@ -27,7 +27,8 @@
 - defaults:
     name: global
     job_prefix: 'airship'
-    ci_github_jenkins_credentials_id: 'a59788aa-737d-4d34-80d1-dfebb86fcbb8'
+    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
+    ci_ghprb_auth_id: 'a59788aa-737d-4d34-80d1-dfebb86fcbb8'
     ci_github_repo: 'Nordix/airship-dev-tools'
     ci_github_admin_user: 'nordixinfra'
     ci_github_whitelist_org:

diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml
index ad6e26fb0c91bbc2b6abcbbf5ac3edc0cb8d5961..b46c3fc42a64ee55dbe6d68b29d0d4002ddeaf2c 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml
@@ -65,7 +65,7 @@
           - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
-        auth-id: "{ci_github_jenkins_credentials_id}"
+        auth-id: "{ci_ghprb_auth_id}"
         trigger-phrase: '/test-centos-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True

diff --git a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
index 70e7a2e2f760f8aa2b2ed40875f3fbcf63eb2d26..a56a3d9cd92f8bf156a1d4cd6b1e081fe628c350 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
@@ -65,7 +65,7 @@
           - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
-        auth-id: "{ci_github_jenkins_credentials_id}"
+        auth-id: "{ci_ghprb_auth_id}"
         trigger-phrase: '/test-integration'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True

diff --git a/jjb/airship/job_capi_bm_unit_tests.yml b/jjb/airship/job_capi_bm_unit_tests.yml
index 40be078962fa6515062920d2847cee1bf7d8b86d..f7983d13030f0803192810eed5ca546201056c6d 100644 (file)
--- a/jjb/airship/job_capi_bm_unit_tests.yml
+++ b/jjb/airship/job_capi_bm_unit_tests.yml
@@ -61,7 +61,7 @@
           - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
-        auth-id: "{ci_github_jenkins_credentials_id}"
+        auth-id: "{ci_ghprb_auth_id}"
         trigger-phrase: '/test-unit'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
@@ -90,4 +90,3 @@
           shallow-clone: False
       script-path: 'ci/jobs/{id}.pipeline'
       lightweight-checkout: False
-

diff --git a/jjb/airship/job_linter_tests.yml b/jjb/airship/job_linter_tests.yml
index 675e520c65dff490ac62eb3a11082854db566ebe..dd437e0e4c02f58bd3e6de4f4cade6405c7da446 100644 (file)
--- a/jjb/airship/job_linter_tests.yml
+++ b/jjb/airship/job_linter_tests.yml
@@ -61,7 +61,7 @@
           - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
-        auth-id: "{ci_github_jenkins_credentials_id}"
+        auth-id: "{ci_ghprb_auth_id}"
         trigger-phrase: '/lint'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index dc636e7e7b5f0445649d20c0dc3cb2264d723373..97845b2cc5ef3026012e1af9417ac51d8278889b 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -93,7 +93,7 @@
     repo:
       org: "metal3-io"
       name: "baremetal-operator"
-    ci_github_jenkins_credentials_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
 
 
 - project:
@@ -108,7 +108,7 @@
     repo:
       org: "metal3-io"
       name: "metal3-dev-env"
-    ci_github_jenkins_credentials_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
 
 - project:
     name: "metal3io_capi_bm"
@@ -121,7 +121,7 @@
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-baremetal"
-    ci_github_jenkins_credentials_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
 
 - project:
     name: 'update_nordix'