Airship Parameterize the script path for e2e metal3 tests
and add the project-infra jobs
Change-Id: Ifac6229528098a03b74cf45e2db156ddb4666d0e
diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml
index 292aee0..f41a72f 100644
--- a/jjb/airship/defaults.yml
+++ b/jjb/airship/defaults.yml
@@ -33,3 +33,4 @@
ci_github_admin_user: 'nordixinfra'
ci_github_whitelist_org:
- nordix-airship
+ ci_github_pipeline: 'ci/jobs/capi_bm_integration_tests.pipeline'
diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml
index 4620926..b0cab35 100644
--- a/jjb/airship/job_capi_bm_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml
@@ -105,5 +105,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
diff --git a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
index 02467b1..2b0f79a 100644
--- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
@@ -105,5 +105,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
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 6776997..3211f0f 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/Nordix/airship-dev-tools.git
+ url: https://github.com/{ci_github_repo}.git
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- '{branch|master}'
@@ -88,5 +88,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
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 66ba8ae..3a1356a 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/Nordix/airship-dev-tools.git
+ url: https://github.com/{ci_github_repo}.git
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- '{branch|master}'
@@ -88,5 +88,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
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 66dba36..7a5cab0 100644
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
@@ -105,5 +105,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
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 41837d3..2b76867 100644
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
@@ -105,5 +105,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
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 3590a79..9667399 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/Nordix/airship-dev-tools.git
+ url: https://github.com/{ci_github_repo}.git
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- '{branch|master}'
@@ -88,5 +88,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
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 787cc24..d54e125 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/Nordix/airship-dev-tools.git
+ url: https://github.com/{ci_github_repo}.git
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- '{branch|master}'
@@ -88,5 +88,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: 'ci/jobs/capi_bm_integration_tests.pipeline'
+ script-path: "{ci_github_pipeline}"
lightweight-checkout: False
diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index a363dba..55ebb82 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -40,6 +40,18 @@
name: "airship-dev-tools"
- project:
+ name: 'metal3io_project_infra'
+ branch: '${{ghprbActualCommit}}'
+ jobs:
+ - capi_bm_integration_tests_ubuntu
+ - capi_bm_integration_tests_centos
+ repo:
+ org: "metal3-io"
+ name: "project-infra"
+ ci_github_repo: 'metal3-io/project-infra'
+ ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
+
+- project:
name: "nordix_bmo"
jobs:
- capi_bm_integration_tests_ubuntu