X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=5ecd7ea07b4447002c81ed6f3dd50b66592f3602;hb=655a47228721c656c5559eac7bb63953d88c7019;hp=b6d52a13d3512cec081878b2412e05ed145c3d84;hpb=37e9bd86c18762f2cc2e94e403a28589e9fae2b4;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index b6d52a13..5ecd7ea0 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -53,12 +53,10 @@
       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'
@@ -90,44 +88,36 @@
       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
-    - capi_bm_v1a2_master_integration_tests_centos
     - capi_bm_v1a3_integration_tests_centos
     - 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"
 
 - project:
-    name: "metal3io_capi_bm"
+    name: "metal3io_capi_m3"
     repo:
       org: "metal3-io"
-      name: "cluster-api-provider-baremetal"
+      name: "cluster-api-provider-metal3"
     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_image"
@@ -135,12 +125,10 @@
       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"
@@ -148,12 +136,10 @@
       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"
@@ -161,9 +147,7 @@
       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