From 2f684f0499675da0ab7a8d30c1f7a8692f0de453 Mon Sep 17 00:00:00 2001 From: maelk Date: Mon, 20 Jan 2020 12:22:14 +0200 Subject: [PATCH] Airship modify github url var Allows to pass the whole repo url for verifications and specify the credentials to use in Github. Change-Id: I1eed3a63496bd712a749305709f712875e1a9f55 --- jjb/airship/defaults.yml | 2 +- jjb/airship/job_capi_bm_integration_tests_centos.yml | 6 +++++- jjb/airship/job_capi_bm_integration_tests_ubuntu.yml | 6 +++++- jjb/airship/job_capi_bm_master_integration_tests_centos.yml | 2 +- jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml | 2 +- jjb/airship/job_capi_bm_unit_tests.yml | 2 +- jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml | 6 +++++- jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml | 6 +++++- .../job_capi_bm_v1a2_master_integration_tests_centos.yml | 2 +- .../job_capi_bm_v1a2_master_integration_tests_ubuntu.yml | 2 +- jjb/airship/job_docker_image_building.yml | 2 +- jjb/airship/job_linter_tests.yml | 2 +- jjb/airship/job_openstack_image_building.yml | 2 +- jjb/airship/job_update_nordix_repos.yml | 2 +- jjb/airship/projects.yml | 6 +++++- 15 files changed, 35 insertions(+), 15 deletions(-) diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml index f41a72fe0..0466ac353 100644 --- a/jjb/airship/defaults.yml +++ b/jjb/airship/defaults.yml @@ -29,7 +29,7 @@ job_prefix: 'airship' ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token' ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2' - ci_github_repo: 'Nordix/airship-dev-tools' + ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git' ci_github_admin_user: 'nordixinfra' ci_github_whitelist_org: - nordix-airship diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml index b0cab355f..72d552ccc 100644 --- a/jjb/airship/job_capi_bm_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml @@ -45,6 +45,10 @@ name: ghprbActualCommit default: 'master' description: 'CI Repo branch for triggering manual build' + - string: + name: ghprbAuthorRepoGitUrl + default: 'https://github.com/{repo[org]}/{repo[name]}.git' + description: 'CI Repo URL for triggering manual build' - string: name: DISTRIBUTION default: 'centos' @@ -96,7 +100,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml index 2b0f79a48..f4203cf3e 100644 --- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml @@ -45,6 +45,10 @@ name: ghprbActualCommit default: 'master' description: 'CI Repo branch for triggering manual build' + - string: + name: ghprbAuthorRepoGitUrl + default: 'https://github.com/{repo[org]}/{repo[name]}.git' + description: 'CI Repo URL for triggering manual build' - string: name: DISTRIBUTION default: 'ubuntu' @@ -96,7 +100,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml index 3211f0f0a..9bcbd7e1f 100644 --- a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml index 3a1356abf..f389cdd60 100644 --- a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_capi_bm_unit_tests.yml b/jjb/airship/job_capi_bm_unit_tests.yml index f7983d130..fa027f806 100644 --- a/jjb/airship/job_capi_bm_unit_tests.yml +++ b/jjb/airship/job_capi_bm_unit_tests.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' 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 7a5cab016..abcd6df3c 100644 --- a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml @@ -45,6 +45,10 @@ name: ghprbActualCommit default: 'master' description: 'CI Repo branch for triggering manual build' + - string: + name: ghprbAuthorRepoGitUrl + default: 'https://github.com/{repo[org]}/{repo[name]}.git' + description: 'CI Repo URL for triggering manual build' - string: name: DISTRIBUTION default: 'centos' @@ -96,7 +100,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' 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 2b7686759..db091171e 100644 --- a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml @@ -45,6 +45,10 @@ name: ghprbActualCommit default: 'master' description: 'CI Repo branch for triggering manual build' + - string: + name: ghprbAuthorRepoGitUrl + default: 'https://github.com/{repo[org]}/{repo[name]}.git' + description: 'CI Repo URL for triggering manual build' - string: name: DISTRIBUTION default: 'ubuntu' @@ -96,7 +100,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml index 966739959..efdd1dee1 100644 --- a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml index d54e12543..3d1e1850c 100644 --- a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_docker_image_building.yml b/jjb/airship/job_docker_image_building.yml index b5083eb26..903787fb7 100644 --- a/jjb/airship/job_docker_image_building.yml +++ b/jjb/airship/job_docker_image_building.yml @@ -51,7 +51,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_linter_tests.yml b/jjb/airship/job_linter_tests.yml index dd437e0e4..8de63fd72 100644 --- a/jjb/airship/job_linter_tests.yml +++ b/jjb/airship/job_linter_tests.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' diff --git a/jjb/airship/job_openstack_image_building.yml b/jjb/airship/job_openstack_image_building.yml index bc66f9980..6261f518e 100644 --- a/jjb/airship/job_openstack_image_building.yml +++ b/jjb/airship/job_openstack_image_building.yml @@ -46,7 +46,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - 'master' diff --git a/jjb/airship/job_update_nordix_repos.yml b/jjb/airship/job_update_nordix_repos.yml index 9a47ed1e5..63757b9f1 100644 --- a/jjb/airship/job_update_nordix_repos.yml +++ b/jjb/airship/job_update_nordix_repos.yml @@ -46,7 +46,7 @@ pipeline-scm: scm: - git: - url: https://github.com/{ci_github_repo}.git + url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - 'master' diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml index 55ebb82ee..256c74c1e 100644 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@ -45,11 +45,15 @@ jobs: - capi_bm_integration_tests_ubuntu - capi_bm_integration_tests_centos + - capi_bm_v1a2_integration_tests_ubuntu + - capi_bm_v1a2_integration_tests_centos repo: org: "metal3-io" name: "project-infra" - ci_github_repo: 'metal3-io/project-infra' + ci_github_repo: '${{ghprbAuthorRepoGitUrl}}' ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline' + ci_github_jenkins_credentials_id: 'metal3-jenkins-github-token' + ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - project: name: "nordix_bmo" -- 2.25.1