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 292aee00b891720e20721856628e5845d9583dbe..f41a72fe08bc11b7e96fdd855328ef4e117880ef 100644 (file)
--- 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 4620926c054e764a4b2540537b9cdf1e814aa987..b0cab355f386f39e8174abdcd05158c9cf51ed20 100644 (file)
--- 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 02467b1d68e53662cb4e3667eed9be526e10b667..2b0f79a486b3698c8b11343bec6134c4b243ebb7 100644 (file)
--- 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 6776997c44b047e2d1977dbf0fd70ad1aa3aa42f..3211f0f0aef0c25c0e2ae6e9dcfa6b0e43630ab8 100644 (file)
--- 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 66ba8aef61eb17c2e96068751312ae7d594c961c..3a1356abf671eb813a62df9088e7361c752d8e5a 100644 (file)
--- 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 66dba36474bc651a8bf096df9b1731dc317c6d03..7a5cab0168ef0a52ad0ce11ea1fc96d60b340d7d 100644 (file)
--- 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 41837d3157d7e305891b63e0f72e5b7f8d6cc6ee..2b7686759f00c3964f6c28c640c3b71dcfc68126 100644 (file)
--- 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 3590a79155566d5af79b7e91d1faf9b95b47f9bd..966739959e0b8deb7b0f1cd0076d2f409568dcf8 100644 (file)
--- 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 787cc24388d7c7814f9a0da05889cfc0f01d440a..d54e125432e57edf1546380cc80d8034b0e93518 100644 (file)
--- 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 a363dba062cdf035550d4843d89363f772d30c8b..55ebb82eefc8bbd960d47e53d330ff48b6390bcd 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -39,6 +39,18 @@
       org: "Nordix"
       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: