X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=38699997671a952bda8eec5f58b79a96f4745b80;hb=4c24c1e3c1b301fae59cbdc0a7938675d4e454e6;hp=dc5e96a15d8be30bcaba33702835992c957c227d;hpb=44d4a17c7c739cf0a6f8674eab333b4f5b7cc0ed;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index dc5e96a1..38699997 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -38,6 +38,11 @@
     - 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"
@@ -45,95 +50,33 @@
     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"
     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
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
+    - bml_integration_tests_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
-    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,13 +84,13 @@
       org: "metal3-io"
       name: "baremetal-operator"
     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
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
     - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
 
 - project:
     name: "metal3io_ipam"
@@ -157,24 +100,34 @@
     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
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_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
+    - 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
 
     repo:
       org: "metal3-io"
@@ -186,13 +139,21 @@
       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
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_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
+
 
 - project:
     name: "metal3io_ironic_image"
@@ -200,27 +161,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_centos
-    - 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
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
+    - capi_bm_v1a5_integration_tests_centos
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
@@ -228,10 +174,7 @@
       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
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu