X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fprojects.yml;h=b365bf13e63c36756d4a361922f3fd0702df3a08;hb=717b9af093b9e922d364a9815068b144b35f03e9;hp=9fb7ae33a4ddb5e0c491c6a463a415db606cd1c9;hpb=17424435205d2e414e30017eaaa0d488c46a6a57;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 9fb7ae33..b365bf13 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -43,6 +43,48 @@
     ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
     ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
 
+- project:
+    name: 'nordix_metal3_dev_env'
+    branch: '${{ghprbActualCommit}}'
+    ci_github_whitelist_org:
+    - nordix-airship
+    jobs:
+    - feature_tests_ubuntu
+    repo:
+      org: "Nordix"
+      name: "metal3-dev-env"
+    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'
+    branch: '${{ghprbActualCommit}}'
+    ci_github_whitelist_org:
+    - nordix-airship
+    jobs:
+    - feature_tests_ubuntu
+    repo:
+      org: "Nordix"
+      name: "baremetal-operator"
+    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_capi_m3'
+    branch: '${{ghprbActualCommit}}'
+    ci_github_whitelist_org:
+    - nordix-airship
+    jobs:
+    - feature_tests_ubuntu
+    repo:
+      org: "Nordix"
+      name: "cluster-api-provider-metal3"
+    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: 'metal3io_project_infra'
     branch: '${{ghprbActualCommit}}'
@@ -53,12 +95,11 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - feature_tests_ubuntu
 
 - project:
     name: 'metal3io_project_infra_cleanup'
@@ -90,20 +131,15 @@
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - feature_tests_ubuntu
 
 - project:
     name: "metal3io_metal3_dev_env"
     jobs:
-    - 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_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a3_master_integration_tests_ubuntu
@@ -112,18 +148,12 @@
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a4_master_integration_tests_centos
     - capi_bm_v1a4_master_integration_tests_ubuntu
-    repo:
-      org: "metal3-io"
-      name: "metal3-dev-env"
+    - feature_tests_ubuntu
+    - master_feature_tests_ubuntu
 
-- project:
-    name: "metal3io_capi_bm"
     repo:
       org: "metal3-io"
-      name: "cluster-api-provider-baremetal"
-    jobs:
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
+      name: "metal3-dev-env"
 
 - project:
     name: "metal3io_capi_m3"
@@ -135,6 +165,7 @@
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - feature_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_image"
@@ -142,12 +173,11 @@
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - feature_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_inspector"
@@ -155,12 +185,11 @@
       org: "metal3-io"
       name: "ironic-inspector-image"
     jobs:
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - feature_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
@@ -168,9 +197,8 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capi_bm_v1a2_integration_tests_centos
-    - capi_bm_v1a2_integration_tests_ubuntu
     - capi_bm_v1a3_integration_tests_centos
     - capi_bm_v1a3_integration_tests_ubuntu
     - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
+    - feature_tests_ubuntu