Merge "Enable Upstream repos CI for metal3-io integration tests"

diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml
index 2809d5f4d826b0360eb764854bb0a0a63be9b718..bbc3c0560998956726adc98bad44e79b7214e1ec 100644 (file)
--- 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 0eb3db92197dbf08c7027c92364265c1ecaf59fd..6a0aacf4936e1107ea0548df94105c60a01948e1 100644 (file)
--- 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 513dc2a0591f1f4c9f84039b1b8a52238379662f..675e520c65dff490ac62eb3a11082854db566ebe 100644 (file)
--- 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 5f8a7c57a3418b8d7adf37aae8b978070e3fc05e..56b8a60fdebcfd2ff8b355fbf13bff53edae2eef 100644 (file)
--- 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"