X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=4c0e20db02d67a5d6738304734af54d93ca7573c;hb=d6105d88476af408157e9736324734c0e6f2c62e;hp=9fb7ae33a4ddb5e0c491c6a463a415db606cd1c9;hpb=07f5cbc93968a5c363b0b7ca6395938f31db3638;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 9fb7ae33..4c0e20db 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"
@@ -44,35 +46,55 @@
     ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
 
 - project:
-    name: 'metal3io_project_infra'
+    name: 'nordix_metal3_dev_env'
     branch: '${{ghprbActualCommit}}'
     ci_github_whitelist_org:
     - nordix-airship
-    repo:
-      org: "metal3-io"
-      name: "project-infra"
-    ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - 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
+    - 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: 'metal3io_project_infra_cleanup'
+    name: 'nordix_bmo'
+    branch: '${{ghprbActualCommit}}'
     ci_github_whitelist_org:
     - nordix-airship
+    jobs:
+    - feature_tests_ubuntu
+    - feature_tests_centos
+    - feature_tests_upgrade_ubuntu
     repo:
-      org: "metal3-io"
-      name: "project-infra"
-    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
+      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:
-    - capi_bm_master_clean
+    - 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_cleanup_test'
+    name: 'metal3io_project_infra'
     branch: '${{ghprbActualCommit}}'
     ci_github_whitelist_org:
     - nordix-airship
@@ -80,9 +102,14 @@
       org: "metal3-io"
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     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"
@@ -90,40 +117,46 @@
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - 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
+    - feature_tests_ubuntu
+    - feature_tests_centos
+    - feature_tests_upgrade_ubuntu
+
+- project:
+    name: "metal3io_ipam"
+    repo:
+      org: "metal3-io"
+      name: "ip-address-manager"
+    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
 
 - project:
     name: "metal3io_metal3_dev_env"
     jobs:
-    - 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
-    repo:
-      org: "metal3-io"
-      name: "metal3-dev-env"
+    - 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
 
-- project:
-    name: "metal3io_capi_bm"
     repo:
       org: "metal3-io"
-      name: "cluster-api-provider-baremetal"
-    jobs:
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
+      name: "metal3-dev-env"
 
 - project:
     name: "metal3io_capi_m3"
@@ -131,10 +164,15 @@
       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:
     name: "metal3io_ironic_image"
@@ -142,25 +180,13 @@
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - 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
-
-- project:
-    name: "metal3io_ironic_inspector"
-    repo:
-      org: "metal3-io"
-      name: "ironic-inspector-image"
-    jobs:
-    - 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
+    - feature_tests_ubuntu
+    - feature_tests_centos
+    - feature_tests_upgrade_ubuntu
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
@@ -168,9 +194,10 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - 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
+    - feature_tests_ubuntu
+    - feature_tests_centos
+    - feature_tests_upgrade_ubuntu