X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fairship%2Fprojects.yml;h=5ecd7ea07b4447002c81ed6f3dd50b66592f3602;hb=8d3040056fcc849426e6a748bb4a127bef434908;hp=256c74c1ef78104845420c9e4b4e3a51d6758408;hpb=bf24c8bf631992ac9e7d65b8bf91a71f1191fcd9;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 256c74c1..5ecd7ea0 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -29,186 +29,125 @@
 - project:
     name: 'nordix_dev_tools'
     branch: '${{ghprbActualCommit}}'
+    ci_github_whitelist_org:
+    - nordix-airship
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
     - linter_tests
     - openstack_image_building
     - docker_image_building
+    - update_nordix_repos
     repo:
       org: "Nordix"
       name: "airship-dev-tools"
+    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}}'
-    jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
-    - capi_bm_v1a2_integration_tests_centos
+    ci_github_whitelist_org:
+    - nordix-airship
     repo:
       org: "metal3-io"
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
-    ci_github_jenkins_credentials_id: 'metal3-jenkins-github-token'
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
-
-- project:
-    name: "nordix_bmo"
-    jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_unit_tests
-    - capi_bm_v1a2_integration_tests_ubuntu
-    - capi_bm_v1a2_integration_tests_centos
-    - linter_tests
-    repo:
-      org: "Nordix"
-      name: "baremetal-operator"
-
-- project:
-    name: "nordix_capi"
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - linter_tests
-    repo:
-      org: "Nordix"
-      name: "cluster-api"
+    - 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: "nordix_metal3_dev_env"
-    jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
-    - capi_bm_v1a2_integration_tests_centos
-    - linter_tests
+    name: 'metal3io_project_infra_cleanup'
+    ci_github_whitelist_org:
+    - nordix-airship
     repo:
-      org: "Nordix"
-      name: "metal3-dev-env"
-
-- project:
-    name: "nordix_capi_bm"
+      org: "metal3-io"
+      name: "project-infra"
+    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_unit_tests
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
-    - linter_tests
-    repo:
-      org: "Nordix"
-      name: "cluster-api-provider-baremetal"
-
+    - capi_bm_master_clean
 
 - project:
-    name: "metal3io_bmo"
+    name: 'metal3io_project_infra_cleanup_test'
+    branch: '${{ghprbActualCommit}}'
     ci_github_whitelist_org:
-    - metal3-io
     - 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_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
+    - capi_bm_clean
 
+- project:
+    name: "metal3io_bmo"
     repo:
       org: "metal3-io"
       name: "baremetal-operator"
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
-
+    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
 
 - project:
     name: "metal3io_metal3_dev_env"
-    ci_github_whitelist_org:
-    - metal3-io
-    - nordix-airship
     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
     repo:
       org: "metal3-io"
       name: "metal3-dev-env"
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
 
 - project:
-    name: "metal3io_capi_bm"
-    ci_github_whitelist_org:
-    - metal3-io
-    - nordix-airship
-    jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
-
+    name: "metal3io_capi_m3"
     repo:
       org: "metal3-io"
-      name: "cluster-api-provider-baremetal"
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+      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
 
 - project:
     name: "metal3io_ironic_image"
-    ci_github_whitelist_org:
-    - metal3-io
-    - nordix-airship
-    jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
-
     repo:
       org: "metal3-io"
       name: "ironic-image"
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+    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
 
 - project:
     name: "metal3io_ironic_inspector"
-    ci_github_whitelist_org:
-    - metal3-io
-    - nordix-airship
-    jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
-
     repo:
       org: "metal3-io"
       name: "ironic-inspector-image"
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+    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
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
-    ci_github_whitelist_org:
-    - metal3-io
-    - nordix-airship
-    jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
-
     repo:
       org: "metal3-io"
       name: "ironic-ipa-downloader"
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
-
-- project:
-    name: 'update_nordix'
     jobs:
-    - update_nordix_repos
-    repo:
-      org: "Nordix"
-      name: "airship-dev-tools"
+    - capi_bm_v1a3_integration_tests_centos
+    - capi_bm_v1a3_integration_tests_ubuntu
+    - capi_bm_v1a4_integration_tests_centos
+    - capi_bm_v1a4_integration_tests_ubuntu