X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=48cecb10746e1d9a452e25c9ca6c69388dedb045;hb=1e8bb407d20b02d6afdaef8b565da0b6e7240926;hp=218c34a796a0e7ef089a0f88dc5fef5e66b5f7a0;hpb=11b5c630d5511f36c08bc793c7eed1885d873674;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 218c34a7..48cecb10 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -35,7 +35,14 @@
     - linter_tests
     - openstack_image_building
     - docker_image_building
+    - 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
+    - artifactory_cleanup
     repo:
       org: "Nordix"
       name: "airship-dev-tools"
@@ -50,6 +57,7 @@
     - nordix-airship
     jobs:
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
     repo:
       org: "Nordix"
@@ -65,6 +73,7 @@
     - nordix-airship
     jobs:
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
     repo:
       org: "Nordix"
@@ -80,6 +89,7 @@
     - nordix-airship
     jobs:
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
     repo:
       org: "Nordix"
@@ -98,11 +108,12 @@
       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
 
 - project:
@@ -114,48 +125,49 @@
       name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - capi_bm_master_clean
+    - 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
+    - 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
     - master_feature_tests_ubuntu
+    - master_feature_tests_centos
     - master_feature_tests_upgrade_ubuntu
 
     repo:
@@ -168,11 +180,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
+    - capi_capm3_v1a5_e2e_tests_centos
     - feature_tests_ubuntu
+    - feature_tests_centos
     - feature_tests_upgrade_ubuntu
 
 - project:
@@ -181,24 +196,12 @@
       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
-
-- 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
 
 - project:
@@ -207,9 +210,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