Merge "Airship modify github url var"
diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml
index f41a72f..0466ac3 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 b0cab35..72d552c 100644
--- a/jjb/airship/job_capi_bm_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml
@@ -46,6 +46,10 @@
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'
description: 'Distribution to use for the tests. Can be ubuntu or 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 2b0f79a..f4203cf 100644
--- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
@@ -46,6 +46,10 @@
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'
description: 'Distribution to use for the tests. Can be ubuntu or 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_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml
index 3211f0f..9bcbd7e 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 3a1356a..f389cdd 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 f7983d1..fa027f8 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 7a5cab0..abcd6df 100644
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
@@ -46,6 +46,10 @@
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'
description: 'Distribution to use for the tests. Can be ubuntu or 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 2b76867..db09117 100644
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
@@ -46,6 +46,10 @@
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'
description: 'Distribution to use for the tests. Can be ubuntu or 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_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml
index 9667399..efdd1de 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 d54e125..3d1e185 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 b5083eb..903787f 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 dd437e0..8de63fd 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 bc66f99..6261f51 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 9a47ed1..63757b9 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 55ebb82..256c74c 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"