X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fairship%2Fprojects.yml;h=b82a213d88d153ea52872288409a300267c0ecd6;hb=d3fa0b99ccf6dbab3d259b749689c20941128570;hp=d35fc4364598ab9acea03cd17c0c1b3dc8751403;hpb=75049983152ee45f9b50333783358e05c0db9365;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index d35fc436..b82a213d 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -35,7 +35,9 @@
     - linter_tests
     - openstack_image_building
     - docker_image_building
+    - update_nordix_artifacts
     - update_nordix_repos
+    - openstack_node_image_building
     repo:
       org: "Nordix"
       name: "airship-dev-tools"
@@ -50,8 +52,8 @@
     - nordix-airship
     jobs:
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
     repo:
       org: "Nordix"
       name: "metal3-dev-env"
@@ -66,8 +68,8 @@
     - nordix-airship
     jobs:
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
     repo:
       org: "Nordix"
       name: "baremetal-operator"
@@ -82,8 +84,8 @@
     - nordix-airship
     jobs:
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
     repo:
       org: "Nordix"
       name: "cluster-api-provider-metal3"
@@ -101,69 +103,56 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
 
 - 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
+    name: "metal3io_bmo"
     repo:
       org: "metal3-io"
-      name: "project-infra"
-    ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
+      name: "baremetal-operator"
     jobs:
-    - capi_bm_clean
+    - 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_bmo"
+    name: "metal3io_ipam"
     repo:
       org: "metal3-io"
-      name: "baremetal-operator"
+      name: "ip-address-manager"
     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
-    - feature_tests_ubuntu
-    - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
 
 - project:
     name: "metal3io_metal3_dev_env"
     jobs:
-    - 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
+    - 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
-    - feature_tests_upgrade_centos
     - master_feature_tests_ubuntu
+    - master_feature_tests_centos
     - master_feature_tests_upgrade_ubuntu
-    - master_feature_tests_upgrade_centos
 
     repo:
       org: "metal3-io"
@@ -175,13 +164,14 @@
       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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capi_capm3_v1a5_e2e_tests_ubuntu
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
 
 - project:
     name: "metal3io_ironic_image"
@@ -189,27 +179,13 @@
       org: "metal3-io"
       name: "ironic-image"
     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
-    - feature_tests_ubuntu
-    - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
-
-- project:
-    name: "metal3io_ironic_inspector"
-    repo:
-      org: "metal3-io"
-      name: "ironic-inspector-image"
-    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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
@@ -217,10 +193,10 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - feature_tests_upgrade_centos