Merge "Airship modify github url var"

[infra/cicd.git] / jjb / airship / projects.yml

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 5f8a7c57a3418b8d7adf37aae8b978070e3fc05e..256c74c1ef78104845420c9e4b4e3a51d6758408 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -30,16 +30,39 @@
     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"
 
+- 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
+    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
+    - 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 +71,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 +81,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 +93,122 @@
 - 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: "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'
+
+- 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"