X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=5f487e91c9869a5eda35796fd368f4e53943e135;hb=2c8d2d79082da372f693a455581db34fdb28b407;hp=5f8a7c57a3418b8d7adf37aae8b978070e3fc05e;hpb=fbcb1c95dc770dc8f5dd0a155b492de5e807a61c;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 5f8a7c57..5f487e91 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -30,8 +30,11 @@
     name: 'nordix_dev_tools'
     branch: '${{ghprbActualCommit}}'
     jobs:
-    - capi_bm_integration_tests
+    - capi_bm_integration_tests_ubuntu
+    - capi_bm_integration_tests_centos
     - linter_tests
+    - openstack_image_building
+    - docker_image_building
     repo:
       org: "Nordix"
       name: "airship-dev-tools"
@@ -39,7 +42,11 @@
 - project:
     name: "nordix_bmo"
     jobs:
-    - capi_bm_integration_tests
+    - 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"
@@ -48,7 +55,8 @@
 - project:
     name: "nordix_capi"
     jobs:
-    - capi_bm_integration_tests
+    - capi_bm_integration_tests_ubuntu
+    - capi_bm_integration_tests_centos
     - linter_tests
     repo:
       org: "Nordix"
@@ -57,7 +65,10 @@
 - project:
     name: "nordix_metal3_dev_env"
     jobs:
-    - capi_bm_integration_tests
+    - capi_bm_integration_tests_ubuntu
+    - capi_bm_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_ubuntu
+    - capi_bm_v1a2_integration_tests_centos
     - linter_tests
     repo:
       org: "Nordix"
@@ -66,38 +77,74 @@
 - project:
     name: "nordix_capi_bm"
     jobs:
-    - capi_bm_integration_tests
+    - 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"
 
-# TODO: Enable Upstream project CIs after approval.
-
-# - project:
-#     name: "metal3io_bmo"
-#     ci_github_whitelist_org: "metal3-io"
-#     jobs:
-#     - capi_bm_integration_tests
-#     repo:
-#       org: "metal3-io"
-#       name: "baremetal-operator"
-
-
-# - project:
-#     name: "metal3io_metal3_dev_env"
-#     ci_github_whitelist_org: "metal3-io"
-#     jobs:
-#     - capi_bm_integration_tests
-#     repo:
-#       org: "metal3-io"
-#       name: "metal3-dev-env"
-
-# - project:
-#     name: "metal3io_capi_bm"
-#     ci_github_whitelist_org: "metal3-io"
-#     jobs:
-#     - capi_bm_integration_tests
-#     repo:
-#       org: "metal3-io"
-#       name: "cluster-api-provider-baremetal"
+
+- 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'
+
+
+- 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
+
+    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
+
+    repo:
+      org: "metal3-io"
+      name: "cluster-api-provider-baremetal"
+    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
+
+- project:
+    name: 'update_nordix'
+    jobs:
+    - update_nordix_repos
+    repo:
+      org: "Nordix"
+      name: "airship-dev-tools"