From 39ce79ea05e4ed301fe7b6123058d8b6822e2c57 Mon Sep 17 00:00:00 2001 From: maelk Date: Fri, 18 Oct 2019 15:38:04 +0300 Subject: [PATCH 1/1] Separate github and ghprb credentials in airship jobs update github token for ghprb Change-Id: I12b10e6a1da467500519028e88f373f41265cabc --- jjb/airship/defaults.yml | 3 ++- jjb/airship/job_capi_bm_integration_tests_centos.yml | 2 +- jjb/airship/job_capi_bm_integration_tests_ubuntu.yml | 2 +- jjb/airship/job_capi_bm_unit_tests.yml | 3 +-- jjb/airship/job_linter_tests.yml | 2 +- jjb/airship/projects.yml | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml index 1d4a9ed0..8e1f829f 100644 --- 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 ad6e26fb..b46c3fc4 100644 --- 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 70e7a2e2..a56a3d9c 100644 --- 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 40be0789..f7983d13 100644 --- 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 675e520c..dd437e0e 100644 --- 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 dc636e7e..97845b2c 100644 --- 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' -- 2.25.1