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

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index a363dba0..d65200f7 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -29,170 +29,176 @@
 - 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_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"
+    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"
-    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
+    name: 'metal3io_project_infra'
+    branch: '${{ghprbActualCommit}}'
     repo:
-      org: "Nordix"
-      name: "baremetal-operator"
-
-- project:
-    name: "nordix_capi"
+      org: "metal3-io"
+      name: "project-infra"
+    ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capi_bm_integration_tests_ubuntu
-    - capi_bm_integration_tests_centos
-    - linter_tests
-    repo:
-      org: "Nordix"
-      name: "cluster-api"
+    - 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: "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'
     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"
-
+    - master_clean
 
 - project:
     name: "metal3io_bmo"
-    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: "baremetal-operator"
-    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+    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
+    - 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_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
+    - 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"
-    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_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"
-    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_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"
-    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'
-
-- 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'
+    - 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"
-    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_v1a4_integration_tests_ubuntu
+    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu