X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=9fb7ae33a4ddb5e0c491c6a463a415db606cd1c9;hb=refs%2Fchanges%2F23%2F3923%2F2;hp=59546d6a6d457a5391d4b1944398408487207aa1;hpb=aa86f6e819c275928542c19e8e463f9eafd32cdc;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 59546d6a..9fb7ae33 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -53,12 +53,36 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
     - capi_bm_v1a2_integration_tests_centos
     - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu
+
+- project:
+    name: 'metal3io_project_infra_cleanup'
+    ci_github_whitelist_org:
+    - nordix-airship
+    repo:
+      org: "metal3-io"
+      name: "project-infra"
+    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
+    jobs:
+    - capi_bm_master_clean
+
+- project:
+    name: 'metal3io_project_infra_cleanup_test'
+    branch: '${{ghprbActualCommit}}'
+    ci_github_whitelist_org:
+    - nordix-airship
+    repo:
+      org: "metal3-io"
+      name: "project-infra"
+    ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
+    jobs:
+    - capi_bm_clean
 
 - project:
     name: "metal3io_bmo"
@@ -66,20 +90,16 @@
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
     - capi_bm_v1a2_integration_tests_centos
     - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu
 
 - project:
     name: "metal3io_metal3_dev_env"
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_master_integration_tests_ubuntu
-    - capi_bm_master_integration_tests_centos
     - capi_bm_v1a2_integration_tests_centos
     - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a2_master_integration_tests_ubuntu
@@ -88,6 +108,10 @@
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a3_master_integration_tests_ubuntu
     - capi_bm_v1a3_master_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a4_master_integration_tests_centos
+    - capi_bm_v1a4_master_integration_tests_ubuntu
     repo:
       org: "metal3-io"
       name: "metal3-dev-env"
@@ -98,12 +122,19 @@
       org: "metal3-io"
       name: "cluster-api-provider-baremetal"
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
     - capi_bm_v1a2_integration_tests_centos
     - capi_bm_v1a2_integration_tests_ubuntu
+
+- project:
+    name: "metal3io_capi_m3"
+    repo:
+      org: "metal3-io"
+      name: "cluster-api-provider-metal3"
+    jobs:
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_image"
@@ -111,12 +142,12 @@
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
     - capi_bm_v1a2_integration_tests_centos
     - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_inspector"
@@ -124,12 +155,12 @@
       org: "metal3-io"
       name: "ironic-inspector-image"
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
     - capi_bm_v1a2_integration_tests_centos
     - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
@@ -137,9 +168,9 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
     - capi_bm_v1a2_integration_tests_centos
     - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu