Add e2e tests trigger to project-infra

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

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 2ba404079e3f43f5617b9155b93ac10e25ba7389..4b9632167adb8ad0b6118dd7d8db205da24f6a26 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -43,7 +43,7 @@
         image_os:
           - ubuntu
           - centos
-    - artifactory_cleanup
+    - artifact_cleanup
     repo:
       org: "Nordix"
       name: "metal3-dev-tools"
@@ -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,9 +221,14 @@
 
 - project:
     name: "capm3"
-    repo:
-      org: "metal3-io"
-      name: "cluster-api-provider-metal3"
+    org: metal3-io
+    proj:
+      - capm3:
+          repo: cluster-api-provider-metal3
+      - project_infra:
+          repo: project-infra
+          branch: '${{ghprbActualCommit}}'
+          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     image_os:
       - ubuntu
       - centos
@@ -237,15 +242,40 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 target_branches:
-                  - 'master'
                   - 'main'
             - v1a5:
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
                 target_branches:
-                  - 'master'
+                  - 'release-0.5'
+      - keep_capm3_e2e_tests:
+          version:
+            - v1b1:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                target_branches:
                   - 'main'
+            - v1a5:
+                capi_version: v1alpha4
+                capm3_version: v1alpha5
+                target_branches:
                   - 'release-0.5'
+
+- project:
+    name: "capm3-main-tests"
+    repo:
+      org: "metal3-io"
+      name: "cluster-api-provider-metal3"
+    image_os:
+      - ubuntu
+      - centos
+    jobs:
+      - capm3_main_e2e_upgrade_tests:
+          exclude:
+            - image_os: centos
+      - capm3_main_e2e_ephemeral_tests:
+          exclude:
+            - image_os: ubuntu
       - capm3_main_e2e_tests:
           version:
             - v1b1:
@@ -257,4 +287,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