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

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index ef6530e3..070c3996 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -35,7 +35,6 @@
     - 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
@@ -58,8 +57,10 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -88,8 +89,10 @@
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -106,8 +109,10 @@
       org: "metal3-io"
       name: "ip-address-manager"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -120,8 +125,10 @@
 - project:
     name: "metal3_dev_env"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a4_main_integration_tests_centos
     - capm3_v1a4_main_integration_tests_ubuntu
     - capm3_v1a5_integration_tests_centos
@@ -155,8 +162,10 @@
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1a5_e2e_tests_ubuntu
@@ -182,8 +191,10 @@
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -199,7 +210,8 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os: ubuntu
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu