Enable Upstream repos CI for metal3-io integration tests
Change-Id: I71df0ad46ba770a35465e8131b4d37a8e2fbce32
diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml
index 2809d5f..bbc3c05 100644
--- a/jjb/airship/defaults.yml
+++ b/jjb/airship/defaults.yml
@@ -30,4 +30,5 @@
ci_github_jenkins_credentials_id: 'nordixinfra-github-token'
ci_github_repo: 'Nordix/airship-dev-tools'
ci_github_admin_user: 'nordixinfra'
- ci_github_whitelist_org: 'nordix-airship'
+ ci_github_whitelist_org:
+ - nordix-airship
diff --git a/jjb/airship/job_capi_bm_integration_tests.yml b/jjb/airship/job_capi_bm_integration_tests.yml
index 0eb3db9..6a0aacf 100644
--- a/jjb/airship/job_capi_bm_integration_tests.yml
+++ b/jjb/airship/job_capi_bm_integration_tests.yml
@@ -59,8 +59,7 @@
- github-pull-request:
admin-list:
- '{ci_github_admin_user}'
- org-list:
- - '{ci_github_whitelist_org}'
+ org-list: "{ci_github_whitelist_org}"
cron: 'H/5 * * * *'
auth-id: "{ci_github_jenkins_credentials_id}"
trigger-phrase: '/test-integration'
@@ -91,4 +90,3 @@
shallow-clone: False
script-path: 'ci/jobs/{id}.pipeline'
lightweight-checkout: False
-
diff --git a/jjb/airship/job_linter_tests.yml b/jjb/airship/job_linter_tests.yml
index 513dc2a..675e520 100644
--- a/jjb/airship/job_linter_tests.yml
+++ b/jjb/airship/job_linter_tests.yml
@@ -59,8 +59,7 @@
- github-pull-request:
admin-list:
- '{ci_github_admin_user}'
- org-list:
- - '{ci_github_whitelist_org}'
+ org-list: "{ci_github_whitelist_org}"
cron: 'H/5 * * * *'
auth-id: "{ci_github_jenkins_credentials_id}"
trigger-phrase: '/lint'
diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 5f8a7c5..56b8a60 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -72,32 +72,37 @@
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_bmo"
+ ci_github_whitelist_org:
+ - metal3-io
+ - nordix-airship
+ 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_metal3_dev_env"
+ ci_github_whitelist_org:
+ - metal3-io
+ - nordix-airship
+ 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_capi_bm"
+ ci_github_whitelist_org:
+ - metal3-io
+ - nordix-airship
+ jobs:
+ - capi_bm_integration_tests
+ repo:
+ org: "metal3-io"
+ name: "cluster-api-provider-baremetal"