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

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index b6d52a13..d65200f7 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"
@@ -46,88 +53,127 @@
 - project:
     name: 'metal3io_project_infra'
     branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
     repo:
       org: "metal3-io"
       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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - feature_tests_ubuntu
+    - feature_tests_centos
+    - feature_tests_upgrade_ubuntu
+    - bml_integration_tests_centos
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
 - 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
+    - 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
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
+    - feature_tests_ubuntu
 
 - project:
-    name: "metal3io_bmo"
+    name: "metal3io_ipam"
     repo:
       org: "metal3-io"
-      name: "baremetal-operator"
+      name: "ip-address-manager"
     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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
 - 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
+    - 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
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - capm3_v1b1_master_integration_tests_centos
+    - capm3_v1b1_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
+    - bml_integration_tests_centos
+    - bml_master_integration_tests_centos
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
+
     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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capi_capm3_e2e_v1a5_tests_ubuntu
+    - capi_capm3_e2e_v1a5_tests_centos
+    - capi_capm3_master_e2e_v1a5_tests_ubuntu
+    - capi_capm3_master_e2e_v1a5_tests_centos
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - capi_capm3_e2e_v1b1_tests_centos
+    - capi_capm3_e2e_v1b1_tests_ubuntu
+    - capi_capm3_master_e2e_v1b1_tests_centos
+    - capi_capm3_master_e2e_v1b1_tests_ubuntu
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
+
 
 - project:
     name: "metal3io_ironic_image"
@@ -135,25 +181,16 @@
       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
-
-- project:
-    name: "metal3io_ironic_inspector"
-    repo:
-      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
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
@@ -161,9 +198,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_ubuntu
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu