X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=7b678513bca2c708efba5f733c2fe223227c9938;hb=390e931d5d75abaf4a3394abeb2eb0e4f20dbc6c;hp=70f4793f38b23bddde1dbde3564ba6f2efd25a2f;hpb=d6079ff431918577ca8510e2da0e1e929f1dbf88;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 70f4793f..7b678513 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -38,6 +38,10 @@
     - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
+    - openstack_ipa_and_ironic_image_building
+    - metal3_ipa_and_ironic_image_building_test
+    - airship_integration_test_centos
+    - airship_integration_test_ubuntu
     repo:
       org: "Nordix"
       name: "airship-dev-tools"
@@ -105,6 +109,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
@@ -118,20 +124,7 @@
       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
+    - master_clean
 
 - project:
     name: "metal3io_bmo"
@@ -141,6 +134,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 +148,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 +158,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 +181,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 +197,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 +211,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