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

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index b27c7f6b..d65200f7 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -38,8 +38,11 @@
     - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
-    - openstack_ipa_image_building
-    - metal3_ipa_image_building_test_centos
+    - 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"
@@ -47,59 +50,9 @@
     ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
     ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
 
-- project:
-    name: 'nordix_metal3_dev_env'
-    branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
-    jobs:
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
-    repo:
-      org: "Nordix"
-      name: "metal3-dev-env"
-    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
-
-- project:
-    name: 'nordix_bmo'
-    branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
-    jobs:
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
-    repo:
-      org: "Nordix"
-      name: "baremetal-operator"
-    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
-
-- project:
-    name: 'nordix_capi_m3'
-    branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
-    jobs:
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
-    repo:
-      org: "Nordix"
-      name: "cluster-api-provider-metal3"
-    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
-
 - project:
     name: 'metal3io_project_infra'
     branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
     repo:
       org: "metal3-io"
       name: "project-infra"
@@ -109,9 +62,25 @@
     - 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'
+    repo:
+      org: "metal3-io"
+      name: "project-infra"
+    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
+    jobs:
+    - master_clean
 
 - project:
     name: "metal3io_bmo"
@@ -123,9 +92,13 @@
     - 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
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
 
 - project:
     name: "metal3io_ipam"
@@ -137,6 +110,12 @@
     - 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"
@@ -149,12 +128,22 @@
     - 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"
@@ -170,11 +159,21 @@
     - 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
+    - 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"
@@ -186,9 +185,12 @@
     - 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
+    - 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"
@@ -196,10 +198,7 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     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
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu