X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=db6a69123dd15db0cdcf5268ace1d20b97b04c13;hb=2e1382e68c55bbb656a92c3f642e63c709c98e7b;hp=ef6530e383ea381d661a4b24f1ac3da1873335d0;hpb=22522d995180af569328db152a53bc1c5c2cf6af;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index ef6530e3..db6a6912 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -35,13 +35,14 @@
     - linter_tests
     - openstack_image_building
     - docker_image_building
-    - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
     - main_openstack_ipa_and_ironic_image_building
     - metal3_ipa_and_ironic_image_building_test
-    - metal3_dev_tools_integration_test_centos
-    - metal3_dev_tools_integration_test_ubuntu
+    - metal3_dev_tools_integration_test:
+        image_os:
+          - ubuntu
+          - centos
     - artifactory_cleanup
     repo:
       org: "Nordix"
@@ -58,20 +59,32 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a5_integration_tests_centos
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - feature_tests_ubuntu
-    - feature_tests_centos
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - feature_tests:
+        image_os:
+          - ubuntu
+          - centos
     - feature_tests_upgrade_ubuntu
     - bml_integration_tests_centos
-    - keep_v1b1_test_ubuntu_alive
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: 'project_infra_cleanup'
@@ -88,17 +101,28 @@
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a5_integration_tests_centos
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - keep_v1b1_test_ubuntu_alive
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
-    - feature_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - feature_tests:
+        image_os: ubuntu
 
 - project:
     name: "ipam"
@@ -106,48 +130,77 @@
       org: "metal3-io"
       name: "ip-address-manager"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a5_integration_tests_centos
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - keep_v1b1_test_ubuntu_alive
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: "metal3_dev_env"
+    repo:
+      org: "metal3-io"
+      name: "metal3-dev-env"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a4_main_integration_tests_centos
-    - capm3_v1a4_main_integration_tests_ubuntu
-    - capm3_v1a5_integration_tests_centos
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1a5_main_integration_tests_centos
-    - capm3_v1a5_main_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - capm3_v1b1_main_integration_tests_centos
-    - capm3_v1b1_main_integration_tests_ubuntu
-    - feature_tests_ubuntu
-    - feature_tests_centos
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a4_main_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_main_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_main_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - feature_tests:
+        image_os:
+          - ubuntu
+          - centos
     - feature_tests_upgrade_ubuntu
-    - main_feature_tests_ubuntu
-    - main_feature_tests_centos
+    - main_feature_tests:
+        image_os:
+          - ubuntu
+          - centos
     - main_feature_tests_upgrade_ubuntu
     - bml_integration_tests_centos
     - bml_main_integration_tests_centos
-    - keep_v1b1_test_ubuntu_alive
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
-
-    repo:
-      org: "metal3-io"
-      name: "metal3-dev-env"
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: "capm3"
@@ -155,25 +208,43 @@
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a5_integration_tests_centos
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1a5_e2e_tests_ubuntu
-    - capm3_v1a5_e2e_tests_centos
-    - capm3_v1a5_main_e2e_tests_ubuntu
-    - capm3_v1a5_main_e2e_tests_centos
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - capm3_v1b1_e2e_tests_centos
-    - capm3_v1b1_e2e_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_main_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1b1_e2e_upgrade_tests_ubuntu
-    - capm3_v1b1_main_e2e_tests_centos
-    - capm3_v1b1_main_e2e_tests_ubuntu
-    - keep_v1b1_test_ubuntu_alive
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
+    - capm3_v1b1_main_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 
 - project:
@@ -182,16 +253,26 @@
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a5_integration_tests_centos
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - keep_v1b1_test_ubuntu_alive
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: "ironic_ipa_downloader"
@@ -199,7 +280,11 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os: ubuntu
+    - capm3_v1a5_integration_tests:
+        image_os: ubuntu
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos