Parameterize DISTRIBUTION and merge job templates

[infra/cicd.git] / jjb / metal3 / projects.yml

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 1aaa7c7b2864aa96e246e6585c1ca67558c6683c..50e3a13327a6e51970acb5014b838a996b963308 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -38,7 +38,7 @@
     - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
-    - openstack_ipa_and_ironic_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
@@ -58,8 +58,10 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        distribution:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -88,8 +90,10 @@
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        distribution:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -106,8 +110,10 @@
       org: "metal3-io"
       name: "ip-address-manager"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        distribution:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -120,8 +126,10 @@
 - project:
     name: "metal3_dev_env"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        distribution:
+          - ubuntu
+          - centos
     - capm3_v1a4_main_integration_tests_centos
     - capm3_v1a4_main_integration_tests_ubuntu
     - capm3_v1a5_integration_tests_centos
@@ -155,8 +163,10 @@
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        distribution:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1a5_e2e_tests_ubuntu
@@ -182,8 +192,10 @@
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        distribution:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -199,7 +211,8 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        distribution: ubuntu
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu