X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=e44605cabb16c9fb397be25cc1e710bc770e1412;hb=139d039ffb1809c856e28d05408ab787698c3762;hp=5011f3a21049377cd841fd6b20c8e0c10ab48c03;hpb=ff3cf7ca68ab2c3c7482f1adeae664a9e49e23c1;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 5011f3a2..e44605ca 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -67,6 +67,11 @@
           repo: baremetal-operator
       - ipam:
           repo: ip-address-manager
+      - ironic_image:
+          repo: ironic-image
+          name_postfix: '_ironic_from_source'
+          trigger_postfix: '-ironic-source'
+          ironic_install_type: 'source'
       - ironic_image:
           repo: ironic-image
       - ironic_ipa_downloader:
@@ -79,13 +84,11 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           target_branches:
-            - 'master'
             - 'main'
       - v1a5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
           target_branches:
-            - 'master'
             - 'main'
             - 'release-0.5'
             - 'release-0.1'
@@ -93,7 +96,6 @@
           capi_version: v1alpha3
           capm3_version: v1alpha4
           target_branches:
-            - 'master'
             - 'main'
             - 'release-0.4'
             - 'release-0.0'
@@ -133,13 +135,11 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           target_branches:
-            - 'master'
             - 'main'
       - v1a5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
           target_branches:
-            - 'master'
             - 'main'
             - 'release-0.5'
             - 'release-0.1'
@@ -221,6 +221,45 @@
 
 - project:
     name: "capm3"
+    org: metal3-io
+    proj:
+      - capm3:
+          repo: cluster-api-provider-metal3
+      - metal3_dev_env:
+          repo: metal3-dev-env
+      - project_infra:
+          repo: project-infra
+          branch: '${{ghprbActualCommit}}'
+          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+      - bmo:
+          repo: baremetal-operator
+    image_os:
+      - ubuntu
+      - centos
+    version:
+      - v1b1:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          target_branches:
+            - 'main'
+      - v1a5:
+          capi_version: v1alpha4
+          capm3_version: v1alpha5
+          target_branches:
+            - 'release-0.5'
+    jobs:
+      - capm3_e2e_upgrade_tests:
+          exclude:
+            - image_os: centos
+            - version:
+              - v1b1
+              - v1a5
+      - capm3_e2e_tests_parallel:
+      - capm3_e2e_tests:
+      - keep_capm3_e2e_tests:
+
+- project:
+    name: "capm3-main-tests"
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
@@ -228,24 +267,12 @@
       - ubuntu
       - centos
     jobs:
-      - capm3_e2e_upgrade_tests:
+      - capm3_main_e2e_upgrade_tests:
           exclude:
             - image_os: centos
-      - capm3_e2e_tests:
-          version:
-            - v1b1:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                target_branches:
-                  - 'master'
-                  - 'main'
-            - v1a5:
-                capi_version: v1alpha4
-                capm3_version: v1alpha5
-                target_branches:
-                  - 'master'
-                  - 'main'
-                  - 'release-0.5'
+      - capm3_main_e2e_ephemeral_tests:
+          exclude:
+            - image_os: ubuntu
       - capm3_main_e2e_tests:
           version:
             - v1b1:
@@ -257,4 +284,18 @@
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
                 capm3_branch: release-0.5
-                schedule: "H 20 * * *"
+                schedule: "H 23 * * *"
+
+
+- project:
+    name: 'ironic_image_build_tests'
+    org: metal3-io
+    proj:
+      - project_infra:
+          repo: project-infra
+          branch: '${{ghprbActualCommit}}'
+          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+      - ironic_image:
+          repo: ironic-image
+    jobs:
+      - ironic_image_build_tests