X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fairship%2Fprojects.yml;h=052c188a094e9deba9dbe77482bc0259089ed32e;hb=ae1ee3c2d0f106a5d2d33dac9bd648e4d04973df;hp=70f4793f38b23bddde1dbde3564ba6f2efd25a2f;hpb=038584cec2078a6d5b43e0b15dec1b4bb2b8b004;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 70f4793f..052c188a 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -38,6 +38,8 @@
     - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
+    - openstack_ipa_and_ironic_image_building
+    - metal3_ipa_and_ironic_image_building_test_centos
     repo:
       org: "Nordix"
       name: "airship-dev-tools"
@@ -105,34 +107,12 @@
     jobs:
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_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"
     repo:
@@ -141,6 +121,8 @@
     jobs:
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
@@ -153,6 +135,8 @@
     jobs:
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
 
 - project:
     name: "metal3io_metal3_dev_env"
@@ -161,6 +145,10 @@
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a4_master_integration_tests_centos
     - capi_bm_v1a4_master_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capi_bm_v1a5_master_integration_tests_centos
+    - capi_bm_v1a5_master_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
@@ -180,6 +168,10 @@
     jobs:
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capi_capm3_v1a5_e2e_tests_ubuntu
+    - capi_capm3_v1a5_e2e_tests_centos
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
@@ -192,6 +184,8 @@
     jobs:
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
@@ -204,6 +198,8 @@
     jobs:
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu