From 75084291dc288b1090bf43c3a5f69e32a883f79f Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Mon, 29 Jun 2026 11:41:23 +0200 Subject: [PATCH 01/20] feat: add RPM-only presubmit Prow jobs for MicroShift Add e2e-aws-tests-rpm-el9 and e2e-aws-tests-rpm-el10 presubmit jobs that skip image builds and only build RPMs, reducing CI time ~35-40%. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 18 ++++++++++++++++++ .../openshift-microshift-includes-commands.sh | 2 ++ ...hift-microshift-infra-iso-build-commands.sh | 2 ++ 3 files changed, 22 insertions(+) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index e789dd4608162..96787382c1ee1 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -165,6 +165,24 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: presubmits workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-rpm-el9 + run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: rpm-presubmits-el9 + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-rpm-el10 + run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: rpm-presubmits-el10 + workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-cache capabilities: - intranet diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 88ebe57fbe6af..3c1891a745e2a 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -754,6 +754,8 @@ function get_source_dir() { [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios/releases:scenarios" [presubmits]="scenarios/presubmits:scenarios" + [rpm-presubmits-el9]="scenarios-rpm/el9/presubmits-rpm:scenarios-rpm" + [rpm-presubmits-el10]="scenarios-rpm/el10/presubmits-rpm:scenarios-rpm" [periodics]="scenarios/periodics:scenarios-periodics" ) local -r scenario_type=$1 diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 8c599df2a6cf5..718eb9ae8c80a 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -27,6 +27,8 @@ export CI_JOB_NAME="${JOB_NAME}" export GITHUB_TOKEN="\$(cat /tmp/token-git 2>/dev/null || echo '')" if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then ./test/bin/ci_phase_iso_build.sh -update_cache +elif [[ "${SCENARIO_TYPE}" =~ .*presubmit.* ]] ; then + ./test/bin/ci_phase_iso_build.sh -rpm_only else ./test/bin/ci_phase_iso_build.sh fi From d52d2ab1a30236f5ae3f0cf14835a1a6601bcc91 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Mon, 29 Jun 2026 12:00:52 +0200 Subject: [PATCH 02/20] chore: regenerate Prow job definitions after make jobs Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../openshift-microshift-main-presubmits.yaml | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml index 1a2736ca3b681..291b055da5a72 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml @@ -2186,6 +2186,174 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-tests-release-arm,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build03 + context: ci/prow/e2e-aws-tests-rpm-el10 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 + rerun_command: /test e2e-aws-tests-rpm-el10 + run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-rpm-el10 + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el10,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build03 + context: ci/prow/e2e-aws-tests-rpm-el9 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 + rerun_command: /test e2e-aws-tests-rpm-el9 + run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-rpm-el9 + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el9,?($|\s.*) - agent: kubernetes always_run: true branches: From 45cd70027d90663269e546ac684a2ef39523b154 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Mon, 29 Jun 2026 12:04:59 +0200 Subject: [PATCH 03/20] fix: narrow rpm_only match to rpm-presubmits-* scenario types Avoid matching regular presubmit jobs that also contain "presubmit". Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../openshift-microshift-infra-iso-build-commands.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 718eb9ae8c80a..0c688604135e7 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -27,7 +27,7 @@ export CI_JOB_NAME="${JOB_NAME}" export GITHUB_TOKEN="\$(cat /tmp/token-git 2>/dev/null || echo '')" if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then ./test/bin/ci_phase_iso_build.sh -update_cache -elif [[ "${SCENARIO_TYPE}" =~ .*presubmit.* ]] ; then +elif [[ "${SCENARIO_TYPE}" =~ ^rpm-presubmits-.*$ ]] ; then ./test/bin/ci_phase_iso_build.sh -rpm_only else ./test/bin/ci_phase_iso_build.sh @@ -42,7 +42,10 @@ chmod +x /tmp/iso.sh # GBRN=mybranch # git clone "https://github.com/${GUSR}/microshift.git" -b "${GBRN}" /go/src/github.com/openshift/microshift # -ci_clone_src +# TODO: Revert to 'ci_clone_src' before merging +GUSR=agullon +GBRN=shiftweek/rpm-presubmit-ci +git clone "https://github.com/${GUSR}/microshift.git" -b "${GBRN}" /go/src/github.com/openshift/microshift download_brew_rpms() { # See BREW_RPM_SOURCE variable definition in test/bin/common.sh From b01678fb8ceb06161be2c4634b054fcdaacaaf3f Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Mon, 29 Jun 2026 12:58:55 +0200 Subject: [PATCH 04/20] fix: declare SCENARIO_TYPE env var in iso-build step ref The infra-iso-build step references SCENARIO_TYPE but it was not declared in the ref YAML, causing 'unbound variable' with set -u. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../iso-build/openshift-microshift-infra-iso-build-ref.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml index aed589f423fb3..6ac251771a66b 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml @@ -11,6 +11,8 @@ ref: env: - name: HOME default: /tmp/secret + - name: SCENARIO_TYPE + default: "" credentials: - name: microshift-rhsm-creds namespace: test-credentials From 9c32ea09bdd8d5b5290f9939d9245a83cf0b4ad8 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Mon, 29 Jun 2026 15:35:15 +0200 Subject: [PATCH 05/20] fix: correct scenario directory paths for rpm-presubmits The directories on the microshift branch are presubmits/, not presubmits-rpm/. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../includes/openshift-microshift-includes-commands.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 3c1891a745e2a..7d0c8a98d7e60 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -754,8 +754,8 @@ function get_source_dir() { [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios/releases:scenarios" [presubmits]="scenarios/presubmits:scenarios" - [rpm-presubmits-el9]="scenarios-rpm/el9/presubmits-rpm:scenarios-rpm" - [rpm-presubmits-el10]="scenarios-rpm/el10/presubmits-rpm:scenarios-rpm" + [rpm-presubmits-el9]="scenarios-rpm/el9/presubmits:scenarios-rpm" + [rpm-presubmits-el10]="scenarios-rpm/el10/presubmits:scenarios-rpm" [periodics]="scenarios/periodics:scenarios-periodics" ) local -r scenario_type=$1 From ccd225fba616f181134f55044ef00654115157a7 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 30 Jun 2026 12:06:35 +0200 Subject: [PATCH 06/20] feat: merge rpm presubmit jobs and add ARM variant - Merge e2e-aws-tests-rpm-el9 and e2e-aws-tests-rpm-el10 into single e2e-aws-tests-rpm job with unified SCENARIO_TYPE=rpm-presubmits - Add e2e-aws-tests-rpm-arm (m7g.metal) for ARM testing - Update get_source_dir() to single rpm-presubmits mapping Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 10 +++++----- .../openshift-microshift-main-presubmits.yaml | 20 +++++++++---------- .../openshift-microshift-includes-commands.sh | 3 +-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 96787382c1ee1..724d011944912 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -165,23 +165,23 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: presubmits workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-rpm-el9 +- as: e2e-aws-tests-rpm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: rpm-presubmits-el9 + SCENARIO_TYPE: rpm-presubmits workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-rpm-el10 +- as: e2e-aws-tests-rpm-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: c5.metal + EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: rpm-presubmits-el10 + SCENARIO_TYPE: rpm-presubmits workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-cache capabilities: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml index 291b055da5a72..404293f4010c4 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml @@ -2192,7 +2192,7 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm-el10 + context: ci/prow/e2e-aws-tests-rpm decorate: true decoration_config: skip_cloning: true @@ -2202,8 +2202,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 - rerun_command: /test e2e-aws-tests-rpm-el10 + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm + rerun_command: /test e2e-aws-tests-rpm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2213,7 +2213,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm-el10 + - --target=e2e-aws-tests-rpm command: - ci-operator env: @@ -2269,14 +2269,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm-el9 + context: ci/prow/e2e-aws-tests-rpm-arm decorate: true decoration_config: skip_cloning: true @@ -2286,8 +2286,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 - rerun_command: /test e2e-aws-tests-rpm-el9 + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-arm + rerun_command: /test e2e-aws-tests-rpm-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2297,7 +2297,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm-el9 + - --target=e2e-aws-tests-rpm-arm command: - ci-operator env: @@ -2353,7 +2353,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-arm,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 7d0c8a98d7e60..51bb19b520558 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -754,8 +754,7 @@ function get_source_dir() { [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios/releases:scenarios" [presubmits]="scenarios/presubmits:scenarios" - [rpm-presubmits-el9]="scenarios-rpm/el9/presubmits:scenarios-rpm" - [rpm-presubmits-el10]="scenarios-rpm/el10/presubmits:scenarios-rpm" + [rpm-presubmits]="scenarios-rpm/presubmits:scenarios-rpm" [periodics]="scenarios/periodics:scenarios-periodics" ) local -r scenario_type=$1 From 7e8bb93d1f4a0166ab263229aa5a7080c071b722 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 30 Jun 2026 12:54:46 +0200 Subject: [PATCH 07/20] fix: update SCENARIO_TYPE regex to match rpm-presubmits The regex ^rpm-presubmits-.*$ required a trailing dash, but SCENARIO_TYPE was renamed from rpm-presubmits-el9 to rpm-presubmits. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../iso-build/openshift-microshift-infra-iso-build-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 0c688604135e7..e69564e652188 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -27,7 +27,7 @@ export CI_JOB_NAME="${JOB_NAME}" export GITHUB_TOKEN="\$(cat /tmp/token-git 2>/dev/null || echo '')" if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then ./test/bin/ci_phase_iso_build.sh -update_cache -elif [[ "${SCENARIO_TYPE}" =~ ^rpm-presubmits-.*$ ]] ; then +elif [[ "${SCENARIO_TYPE}" =~ ^rpm-presubmits.*$ ]] ; then ./test/bin/ci_phase_iso_build.sh -rpm_only else ./test/bin/ci_phase_iso_build.sh From fd7f0ab64255eaafb4f4bc1b05941979188555c2 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 30 Jun 2026 16:21:38 +0200 Subject: [PATCH 08/20] feat: split RPM presubmit jobs by RHEL version (el9/el10) - Replace unified e2e-aws-tests-rpm with e2e-aws-tests-rpm-el9 and e2e-aws-tests-rpm-el10 (x86 only) - Both point to same scenarios-rpm/presubmits/ directory - SCENARIO_TYPE (rpm-presubmits-el9 or rpm-presubmits-el10) determines the RHEL version at runtime - Write SCENARIO_TYPE to _output/scenario_type in iso-build step for test step to read Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 10 +++++----- .../openshift-microshift-main-presubmits.yaml | 20 +++++++++---------- .../openshift-microshift-includes-commands.sh | 3 ++- ...ift-microshift-infra-iso-build-commands.sh | 3 +++ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 724d011944912..96787382c1ee1 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -165,23 +165,23 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: presubmits workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-rpm +- as: e2e-aws-tests-rpm-el9 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: rpm-presubmits + SCENARIO_TYPE: rpm-presubmits-el9 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-rpm-arm +- as: e2e-aws-tests-rpm-el10 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: m7g.metal + EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: rpm-presubmits + SCENARIO_TYPE: rpm-presubmits-el10 workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-cache capabilities: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml index 404293f4010c4..e9a471a8ac07a 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml @@ -2192,7 +2192,7 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm + context: ci/prow/e2e-aws-tests-rpm-el9 decorate: true decoration_config: skip_cloning: true @@ -2202,8 +2202,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm - rerun_command: /test e2e-aws-tests-rpm + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 + rerun_command: /test e2e-aws-tests-rpm-el9 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2213,7 +2213,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm + - --target=e2e-aws-tests-rpm-el9 command: - ci-operator env: @@ -2269,14 +2269,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el9,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm-arm + context: ci/prow/e2e-aws-tests-rpm-el10 decorate: true decoration_config: skip_cloning: true @@ -2286,8 +2286,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-arm - rerun_command: /test e2e-aws-tests-rpm-arm + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 + rerun_command: /test e2e-aws-tests-rpm-el10 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2297,7 +2297,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm-arm + - --target=e2e-aws-tests-rpm-el10 command: - ci-operator env: @@ -2353,7 +2353,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el10,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 51bb19b520558..1978fd4cf9af2 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -754,7 +754,8 @@ function get_source_dir() { [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios/releases:scenarios" [presubmits]="scenarios/presubmits:scenarios" - [rpm-presubmits]="scenarios-rpm/presubmits:scenarios-rpm" + [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" + [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" [periodics]="scenarios/periodics:scenarios-periodics" ) local -r scenario_type=$1 diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index e69564e652188..2dc6cf7fa0307 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -94,6 +94,9 @@ if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then download_brew_rpms fi +# Write SCENARIO_TYPE for the test step to read on the EC2 instance +echo "${SCENARIO_TYPE}" > /go/src/github.com/openshift/microshift/_output/scenario_type + # Archive the sources, potentially including MicroShift RPMs from brew tar czf /tmp/microshift.tgz /go/src/github.com/openshift/microshift From 84b76329b1a3a4f6de3d57fa12a19be2ec6226ef Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 30 Jun 2026 16:44:31 +0200 Subject: [PATCH 09/20] fix: guard scenario_type write and document shared mapping - Only write scenario_type file when SCENARIO_TYPE is non-empty to avoid polluting tarballs for non-RPM jobs - Add comment explaining why el9/el10 share the same scenario directory Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../includes/openshift-microshift-includes-commands.sh | 1 + .../openshift-microshift-infra-iso-build-commands.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 1978fd4cf9af2..946101f8277e4 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -754,6 +754,7 @@ function get_source_dir() { [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios/releases:scenarios" [presubmits]="scenarios/presubmits:scenarios" + # Both el9/el10 share the same scenarios — RHEL version is derived from SCENARIO_TYPE at runtime [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" [periodics]="scenarios/periodics:scenarios-periodics" diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 2dc6cf7fa0307..9f53d3f3de519 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -94,8 +94,10 @@ if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then download_brew_rpms fi -# Write SCENARIO_TYPE for the test step to read on the EC2 instance -echo "${SCENARIO_TYPE}" > /go/src/github.com/openshift/microshift/_output/scenario_type +# Write SCENARIO_TYPE for the test step to read on the EC2 instance (RPM jobs only) +if [[ -n "${SCENARIO_TYPE}" ]]; then + echo "${SCENARIO_TYPE}" > /go/src/github.com/openshift/microshift/_output/scenario_type +fi # Archive the sources, potentially including MicroShift RPMs from brew tar czf /tmp/microshift.tgz /go/src/github.com/openshift/microshift From e5fc2e4d91bef5c99fb834b6d278e314d855e417 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 30 Jun 2026 19:06:22 +0200 Subject: [PATCH 10/20] fix: create _output dir before writing scenario_type file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The directory doesn't exist yet at the point where scenario_type is written — it's created later by the build scripts. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../iso-build/openshift-microshift-infra-iso-build-commands.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 9f53d3f3de519..e9c711e512750 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -96,6 +96,7 @@ fi # Write SCENARIO_TYPE for the test step to read on the EC2 instance (RPM jobs only) if [[ -n "${SCENARIO_TYPE}" ]]; then + mkdir -p /go/src/github.com/openshift/microshift/_output echo "${SCENARIO_TYPE}" > /go/src/github.com/openshift/microshift/_output/scenario_type fi From 717c25f39bffb10d8a0732ada9f49d41e91eac38 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 12:07:50 +0200 Subject: [PATCH 11/20] feat: rename scenarios/ to scenarios-ostree/ in get_source_dir Aligns with scenarios-bootc/ and scenarios-rpm/ naming convention. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../includes/openshift-microshift-includes-commands.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 946101f8277e4..7064027f6f615 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -752,12 +752,12 @@ function get_source_dir() { [bootc-periodics-el9]="scenarios-bootc/el9/periodics:scenarios-bootc" [bootc-periodics-el10]="scenarios-bootc/el10/periodics:scenarios-bootc" [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" - [releases]="scenarios/releases:scenarios" - [presubmits]="scenarios/presubmits:scenarios" + [releases]="scenarios-ostree/releases:scenarios-ostree" + [presubmits]="scenarios-ostree/presubmits:scenarios-ostree" # Both el9/el10 share the same scenarios — RHEL version is derived from SCENARIO_TYPE at runtime [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" - [periodics]="scenarios/periodics:scenarios-periodics" + [periodics]="scenarios-ostree/periodics:scenarios-ostree" ) local -r scenario_type=$1 local -r base="/home/${HOST_USER}/microshift/test" From eaa74311e184f2979d0866a4d0c2047a11d52c5e Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 13:01:46 +0200 Subject: [PATCH 12/20] feat: replace bootc/ostree presubmits with nightly crons, split periodics - Remove e2e-aws-tests and e2e-aws-tests-bootc-el9/el10 presubmits (ran on every code PR, replaced by RPM presubmits) - Add nightly cron jobs for ostree and bootc periodics (split into -1 and -2 halves for parallel execution) - Update paths from scenarios/ to scenarios-ostree/ - Update get_source_dir for periodics-1/periodics-2 split Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 126 +++++++++++++----- .../openshift-microshift-includes-commands.sh | 9 +- 2 files changed, 96 insertions(+), 39 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 96787382c1ee1..2a8ba6309fe1c 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -147,23 +147,41 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-nightly-1 + cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: presubmits + SCENARIO_TYPE: periodics-1 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-nightly-2 + cron: 30 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: periodics-2 + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-arm-nightly-1 + cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: presubmits + SCENARIO_TYPE: periodics-1 + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-arm-nightly-2 + cron: 30 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: m7g.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: periodics-2 workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-rpm-el9 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ @@ -205,99 +223,135 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache - as: e2e-aws-tests-periodic - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-.*/.*|test/scenarios-ostree/periodics/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-1 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-periodic-arm - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-.*/.*|test/scenarios-ostree/periodics/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-1 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-bootc-nightly-el9-1 + cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el9 + SCENARIO_TYPE: bootc-periodics-el9-1 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-bootc-nightly-el9-2 + cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el10 + SCENARIO_TYPE: bootc-periodics-el9-2 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-bootc-nightly-el10-1 + cron: 0 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el10-1 + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-nightly-el10-2 + cron: 0 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el10-2 + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el9-1 + cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el9 + SCENARIO_TYPE: bootc-periodics-el9-1 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-bootc-arm-nightly-el9-2 + cron: 0 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: m7g.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el9-2 + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el10-1 + cron: 0 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: m7g.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el10-1 + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el10-2 + cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el10 + SCENARIO_TYPE: bootc-periodics-el10-2 workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-.*/.*|test/scenarios-bootc/el9/periodics/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el9-1 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-.*/.*|test/scenarios-bootc/el10/periodics/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el10-1 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-arm-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-.*/.*|test/scenarios-bootc/el9/periodics/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el9-1 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-arm-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-.*/.*|test/scenarios-bootc/el10/periodics/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el10-1 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: ocp-full-conformance-rhel-eus @@ -333,7 +387,7 @@ tests: SUITE: ai-model-serving workflow: openshift-microshift-e2e-bare-metal-tests - as: e2e-aws-tests-release - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -343,7 +397,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-release-arm - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -353,7 +407,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-release-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -363,7 +417,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-release-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -373,7 +427,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-release-arm-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -383,7 +437,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-release-arm-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 7064027f6f615..fd688d7674f11 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -749,15 +749,18 @@ function get_source_dir() { [bootc-releases-el10]="scenarios-bootc/el10/releases:scenarios-bootc" [bootc-presubmits-el9]="scenarios-bootc/el9/presubmits:scenarios-bootc" [bootc-presubmits-el10]="scenarios-bootc/el10/presubmits:scenarios-bootc" - [bootc-periodics-el9]="scenarios-bootc/el9/periodics:scenarios-bootc" - [bootc-periodics-el10]="scenarios-bootc/el10/periodics:scenarios-bootc" + [bootc-periodics-el9-1]="scenarios-bootc/el9/periodics-1:scenarios-bootc" + [bootc-periodics-el9-2]="scenarios-bootc/el9/periodics-2:scenarios-bootc" + [bootc-periodics-el10-1]="scenarios-bootc/el10/periodics-1:scenarios-bootc" + [bootc-periodics-el10-2]="scenarios-bootc/el10/periodics-2:scenarios-bootc" [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios-ostree/releases:scenarios-ostree" [presubmits]="scenarios-ostree/presubmits:scenarios-ostree" # Both el9/el10 share the same scenarios — RHEL version is derived from SCENARIO_TYPE at runtime [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" - [periodics]="scenarios-ostree/periodics:scenarios-ostree" + [periodics-1]="scenarios-ostree/periodics-1:scenarios-ostree" + [periodics-2]="scenarios-ostree/periodics-2:scenarios-ostree" ) local -r scenario_type=$1 local -r base="/home/${HOST_USER}/microshift/test" From a09b1fe2eec0eec4eef065ffd05fe7ac48da04ba Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 15:14:22 +0200 Subject: [PATCH 13/20] chore: rename periodics-1/2 to periodics-lifecycle/functional in CI jobs Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 60 +++++++++---------- .../openshift-microshift-includes-commands.sh | 12 ++-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 2a8ba6309fe1c..9fab271e7cbb8 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -147,41 +147,41 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests-nightly-1 +- as: e2e-aws-tests-nightly-lifecycle cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-1 + SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-nightly-2 +- as: e2e-aws-tests-nightly-functional cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-2 + SCENARIO_TYPE: periodics-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly-1 +- as: e2e-aws-tests-arm-nightly-lifecycle cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-1 + SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly-2 +- as: e2e-aws-tests-arm-nightly-functional cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-2 + SCENARIO_TYPE: periodics-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-rpm-el9 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ @@ -229,7 +229,7 @@ tests: env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-1 + SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-periodic-arm @@ -239,80 +239,80 @@ tests: env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-1 + SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el9-1 +- as: e2e-aws-tests-bootc-nightly-el9-lifecycle cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-1 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el9-2 +- as: e2e-aws-tests-bootc-nightly-el9-functional cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-2 + SCENARIO_TYPE: bootc-periodics-el9-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10-1 +- as: e2e-aws-tests-bootc-nightly-el10-lifecycle cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-1 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10-2 +- as: e2e-aws-tests-bootc-nightly-el10-functional cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-2 + SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el9-1 +- as: e2e-aws-tests-bootc-arm-nightly-el9-lifecycle cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-1 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el9-2 +- as: e2e-aws-tests-bootc-arm-nightly-el9-functional cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-2 + SCENARIO_TYPE: bootc-periodics-el9-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el10-1 +- as: e2e-aws-tests-bootc-arm-nightly-el10-lifecycle cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-1 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el10-2 +- as: e2e-aws-tests-bootc-arm-nightly-el10-functional cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-2 + SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-el9 run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-.*/.*|test/scenarios-bootc/el9/periodics/.*)$ @@ -321,7 +321,7 @@ tests: env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-1 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-el10 @@ -331,7 +331,7 @@ tests: env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-1 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-arm-el9 @@ -341,7 +341,7 @@ tests: env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-1 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-arm-el10 @@ -351,7 +351,7 @@ tests: env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-1 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: ocp-full-conformance-rhel-eus diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index fd688d7674f11..bb1740f1fcae4 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -749,18 +749,18 @@ function get_source_dir() { [bootc-releases-el10]="scenarios-bootc/el10/releases:scenarios-bootc" [bootc-presubmits-el9]="scenarios-bootc/el9/presubmits:scenarios-bootc" [bootc-presubmits-el10]="scenarios-bootc/el10/presubmits:scenarios-bootc" - [bootc-periodics-el9-1]="scenarios-bootc/el9/periodics-1:scenarios-bootc" - [bootc-periodics-el9-2]="scenarios-bootc/el9/periodics-2:scenarios-bootc" - [bootc-periodics-el10-1]="scenarios-bootc/el10/periodics-1:scenarios-bootc" - [bootc-periodics-el10-2]="scenarios-bootc/el10/periodics-2:scenarios-bootc" + [bootc-periodics-el9-lifecycle]="scenarios-bootc/el9/periodics-lifecycle:scenarios-bootc" + [bootc-periodics-el9-functional]="scenarios-bootc/el9/periodics-functional:scenarios-bootc" + [bootc-periodics-el10-lifecycle]="scenarios-bootc/el10/periodics-lifecycle:scenarios-bootc" + [bootc-periodics-el10-functional]="scenarios-bootc/el10/periodics-functional:scenarios-bootc" [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios-ostree/releases:scenarios-ostree" [presubmits]="scenarios-ostree/presubmits:scenarios-ostree" # Both el9/el10 share the same scenarios — RHEL version is derived from SCENARIO_TYPE at runtime [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" - [periodics-1]="scenarios-ostree/periodics-1:scenarios-ostree" - [periodics-2]="scenarios-ostree/periodics-2:scenarios-ostree" + [periodics-lifecycle]="scenarios-ostree/periodics-lifecycle:scenarios-ostree" + [periodics-functional]="scenarios-ostree/periodics-functional:scenarios-ostree" ) local -r scenario_type=$1 local -r base="/home/${HOST_USER}/microshift/test" From a08d7d2c658fd3a7f3d5afd8d08f57902279dd60 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 15:33:12 +0200 Subject: [PATCH 14/20] fix: remove dead presubmits entry, tighten scenario_type guard, stagger crons - Remove dead [presubmits] entry from get_source_dir (directory no longer exists, no job uses SCENARIO_TYPE: presubmits) - Tighten SCENARIO_TYPE file write to rpm-presubmits only (was writing for all jobs unnecessarily) - Stagger 12 nightly cron schedules across 03:00-04:45 to avoid AWS quota contention (was all firing at 03:00/03:30) Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 20 +++++++++---------- .../openshift-microshift-includes-commands.sh | 1 - ...ift-microshift-infra-iso-build-commands.sh | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 9fab271e7cbb8..15e462a969b97 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -157,7 +157,7 @@ tests: SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-nightly-functional - cron: 30 3 * * 1-5 + cron: 0 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -166,7 +166,7 @@ tests: SCENARIO_TYPE: periodics-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-arm-nightly-lifecycle - cron: 30 3 * * 1-5 + cron: 45 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -175,7 +175,7 @@ tests: SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-arm-nightly-functional - cron: 30 3 * * 1-5 + cron: 15 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -252,7 +252,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-nightly-el9-functional - cron: 0 3 * * 1-5 + cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -261,7 +261,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-nightly-el10-lifecycle - cron: 0 3 * * 1-5 + cron: 0 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -270,7 +270,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-lifecycle workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-nightly-el10-functional - cron: 0 3 * * 1-5 + cron: 30 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -279,7 +279,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-arm-nightly-el9-lifecycle - cron: 0 3 * * 1-5 + cron: 15 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -288,7 +288,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-arm-nightly-el9-functional - cron: 0 3 * * 1-5 + cron: 45 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -297,7 +297,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-arm-nightly-el10-lifecycle - cron: 0 3 * * 1-5 + cron: 15 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: @@ -306,7 +306,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-lifecycle workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-arm-nightly-el10-functional - cron: 0 3 * * 1-5 + cron: 45 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index bb1740f1fcae4..13858640bfdad 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -755,7 +755,6 @@ function get_source_dir() { [bootc-periodics-el10-functional]="scenarios-bootc/el10/periodics-functional:scenarios-bootc" [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios-ostree/releases:scenarios-ostree" - [presubmits]="scenarios-ostree/presubmits:scenarios-ostree" # Both el9/el10 share the same scenarios — RHEL version is derived from SCENARIO_TYPE at runtime [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index e9c711e512750..2ce0e7ecff598 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -94,8 +94,8 @@ if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then download_brew_rpms fi -# Write SCENARIO_TYPE for the test step to read on the EC2 instance (RPM jobs only) -if [[ -n "${SCENARIO_TYPE}" ]]; then +# Write SCENARIO_TYPE for RPM scenarios to read on the EC2 instance +if [[ "${SCENARIO_TYPE}" =~ ^rpm-presubmits.*$ ]]; then mkdir -p /go/src/github.com/openshift/microshift/_output echo "${SCENARIO_TYPE}" > /go/src/github.com/openshift/microshift/_output/scenario_type fi From c1901d86ee9cb2f4143337385414c735f6b87e04 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 15:38:13 +0200 Subject: [PATCH 15/20] fix: narrow periodic run_if_changed to lifecycle directory only Prevents triggering lifecycle jobs when only functional scenarios change. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 15e462a969b97..08a62d02b5df2 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -223,7 +223,7 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache - as: e2e-aws-tests-periodic - run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-.*/.*|test/scenarios-ostree/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.* steps: cluster_profile: openshift-org-aws env: @@ -233,7 +233,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-periodic-arm - run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-.*/.*|test/scenarios-ostree/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.* steps: cluster_profile: openshift-org-aws env: @@ -315,7 +315,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-.*/.*|test/scenarios-bootc/el9/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.* steps: cluster_profile: openshift-org-aws env: @@ -325,7 +325,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-.*/.*|test/scenarios-bootc/el10/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.* steps: cluster_profile: openshift-org-aws env: @@ -335,7 +335,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-arm-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-.*/.*|test/scenarios-bootc/el9/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.* steps: cluster_profile: openshift-org-aws env: @@ -345,7 +345,7 @@ tests: TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-arm-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-.*/.*|test/scenarios-bootc/el10/periodics/.*)$ + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.* steps: cluster_profile: openshift-org-aws env: From b4a5a1dff27a926ba88ee69018d2755065e5646b Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 15:41:17 +0200 Subject: [PATCH 16/20] fix: split periodic presubmit jobs into lifecycle + functional Each directory gets its own run_if_changed job so changes to periodics-functional/ trigger the functional job (not lifecycle). Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 84 ++++++++++++++++--- 1 file changed, 72 insertions(+), 12 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 08a62d02b5df2..781b317290474 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -222,8 +222,8 @@ tests: EC2_INSTANCE_TYPE: c7g.2xlarge MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache -- as: e2e-aws-tests-periodic - run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.* +- as: e2e-aws-tests-periodic-lifecycle + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -232,8 +232,18 @@ tests: SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-periodic-arm - run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.* +- as: e2e-aws-tests-periodic-functional + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: periodics-functional + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-periodic-arm-lifecycle + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -242,6 +252,16 @@ tests: SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-periodic-arm-functional + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: m7g.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: periodics-functional + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-nightly-el9-lifecycle cron: 0 3 * * 1-5 steps: @@ -314,8 +334,8 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.* +- as: e2e-aws-tests-bootc-periodic-el9-lifecycle + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -324,8 +344,18 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.* +- as: e2e-aws-tests-bootc-periodic-el9-functional + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el9-functional + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-periodic-el10-lifecycle + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -334,8 +364,18 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.* +- as: e2e-aws-tests-bootc-periodic-el10-functional + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el10-functional + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-periodic-arm-el9-lifecycle + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -344,8 +384,28 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.* +- as: e2e-aws-tests-bootc-periodic-arm-el9-functional + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: m7g.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el9-functional + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-periodic-arm-el10-lifecycle + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: m7g.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-periodic-arm-el10-functional + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws env: From 62fdadc0a4b5fbc025cdd98f5f17c7f49f9379e5 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 15:48:18 +0200 Subject: [PATCH 17/20] fix: move nightly cron jobs from main.yaml to release-5.0__periodics main.yaml keeps only 4 cron jobs: cache-nightly (x2) + upstream (x2). All nightly bootc/ostree jobs moved to release-5.0__periodics.yaml with lifecycle/functional split and staggered schedules. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 108 ------------------ ...ift-microshift-release-5.0__periodics.yaml | 100 +++++++++++----- 2 files changed, 70 insertions(+), 138 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 781b317290474..344efd6a899ea 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -147,42 +147,6 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests-nightly-lifecycle - cron: 30 3 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: c5.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-lifecycle - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-nightly-functional - cron: 0 4 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: c5.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-functional - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly-lifecycle - cron: 45 3 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: m7g.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-lifecycle - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly-functional - cron: 15 4 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: m7g.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics-functional - workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-rpm-el9 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: @@ -262,78 +226,6 @@ tests: SCENARIO_TYPE: periodics-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el9-lifecycle - cron: 0 3 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: c5.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-lifecycle - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el9-functional - cron: 30 3 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: c5.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-functional - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10-lifecycle - cron: 0 4 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: c5.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-lifecycle - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10-functional - cron: 30 4 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: c5.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-functional - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el9-lifecycle - cron: 15 3 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: m7g.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-lifecycle - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el9-functional - cron: 45 3 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: m7g.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9-functional - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el10-lifecycle - cron: 15 4 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: m7g.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-lifecycle - workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el10-functional - cron: 45 4 * * 1-5 - steps: - cluster_profile: openshift-org-aws - env: - EC2_INSTANCE_TYPE: m7g.metal - MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10-functional - workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-periodic-el9-lifecycle run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ steps: diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml index 4328b61c74bc4..43b6aaf976bb2 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml @@ -99,41 +99,77 @@ tests: MICROSHIFT_OS: rhel-9.6 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests-bootc-nightly-el9 +- as: e2e-aws-tests-bootc-nightly-el9-lifecycle cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10 - cron: 0 3 * * 1-5 +- as: e2e-aws-tests-bootc-nightly-el9-functional + cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el9-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el9 - cron: 0 3 * * 1-5 +- as: e2e-aws-tests-bootc-nightly-el10-lifecycle + cron: 0 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-nightly-el10-functional + cron: 30 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el10-functional + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el9-lifecycle + cron: 15 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el10 - cron: 0 3 * * 1-5 +- as: e2e-aws-tests-bootc-arm-nightly-el9-functional + cron: 45 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c7g.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el9-functional + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el10-lifecycle + cron: 15 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c7g.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el10-functional + cron: 45 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-tests-bootc-c2cc-nightly cron: 30 4 * * 1-5 @@ -153,37 +189,41 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-c2cc workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-nightly +- as: e2e-aws-tests-nightly-lifecycle cron: 30 3 * * 1-5 - reporter_config: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly - cron: 30 3 * * 1-5 - reporter_config: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' +- as: e2e-aws-tests-nightly-functional + cron: 0 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: periodics-functional + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-arm-nightly-lifecycle + cron: 45 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c7g.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: periodics-lifecycle + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-arm-nightly-functional + cron: 15 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-ovn-ocp-conformance cron: 0 4 * * 1-5 From d53ad0cf65206db45d8226ddc3c5ddade00714e4 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 1 Jul 2026 16:32:32 +0200 Subject: [PATCH 18/20] chore: apply mandatory naming convention to all CI jobs Rename all e2e-aws-tests-* jobs to follow the pattern: presubmits: e2e-aws-tests-{type}-{trigger}-{el}-{category}-{arch} periodics: e2e-aws-tests-{type}-{arch}-nightly-{el}-{category} Regenerated Prow jobs via make jobs after rebase on main. Co-Authored-By: Claude Opus 4.6 (1M context) pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 54 +- ...ift-microshift-release-5.0__periodics.yaml | 32 +- .../openshift-microshift-main-periodics.yaml | 16 +- .../openshift-microshift-main-presubmits.yaml | 320 ++++----- ...hift-microshift-release-5.0-periodics.yaml | 612 ++++++++++++++++-- .../openshift-microshift-includes-commands.sh | 4 +- 6 files changed, 760 insertions(+), 278 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 344efd6a899ea..59400610fa04a 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -92,7 +92,7 @@ tests: env: DRY_RUN: "y" workflow: openshift-microshift-rebase -- as: e2e-aws-tests-bootc-upstream-periodic +- as: e2e-aws-tests-bootc-upstream-periodic-x86 cron: 0 4 * * 5 steps: cluster_profile: openshift-org-aws @@ -110,7 +110,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: bootc-upstream workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-cache-nightly +- as: e2e-aws-tests-cache-nightly-x86 capabilities: - intranet cron: 30 0 * * * @@ -147,7 +147,7 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests-rpm-el9 +- as: e2e-aws-tests-rpm-presubmit-el9-x86 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws @@ -156,7 +156,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: rpm-presubmits-el9 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-rpm-el10 +- as: e2e-aws-tests-rpm-presubmit-el10-x86 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws @@ -165,7 +165,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: rpm-presubmits-el10 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-cache +- as: e2e-aws-tests-cache-x86 capabilities: - intranet restrict_network_access: false @@ -186,7 +186,7 @@ tests: EC2_INSTANCE_TYPE: c7g.2xlarge MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache -- as: e2e-aws-tests-periodic-lifecycle +- as: e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws @@ -196,7 +196,7 @@ tests: SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-periodic-functional +- as: e2e-aws-tests-ostree-periodic-el9-functional-x86 run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws @@ -206,7 +206,7 @@ tests: SCENARIO_TYPE: periodics-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-periodic-arm-lifecycle +- as: e2e-aws-tests-ostree-periodic-el9-lifecycle-arm run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws @@ -216,7 +216,7 @@ tests: SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-periodic-arm-functional +- as: e2e-aws-tests-ostree-periodic-el9-functional-arm run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws @@ -226,7 +226,7 @@ tests: SCENARIO_TYPE: periodics-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el9-lifecycle +- as: e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws @@ -236,7 +236,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el9-functional +- as: e2e-aws-tests-bootc-periodic-el9-functional-x86 run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws @@ -246,7 +246,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el10-lifecycle +- as: e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws @@ -256,7 +256,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el10-functional +- as: e2e-aws-tests-bootc-periodic-el10-functional-x86 run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws @@ -266,7 +266,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el9-lifecycle +- as: e2e-aws-tests-bootc-periodic-el9-lifecycle-arm run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws @@ -276,7 +276,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el9-functional +- as: e2e-aws-tests-bootc-periodic-el9-functional-arm run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws @@ -286,7 +286,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el9-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el10-lifecycle +- as: e2e-aws-tests-bootc-periodic-el10-lifecycle-arm run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws @@ -296,7 +296,7 @@ tests: SCENARIO_TYPE: bootc-periodics-el10-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el10-functional +- as: e2e-aws-tests-bootc-periodic-el10-functional-arm run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws @@ -338,7 +338,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SUITE: ai-model-serving workflow: openshift-microshift-e2e-bare-metal-tests -- as: e2e-aws-tests-release +- as: e2e-aws-tests-ostree-release-el9-x86 run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws @@ -348,7 +348,7 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-release-arm +- as: e2e-aws-tests-ostree-release-el9-arm run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws @@ -358,7 +358,7 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-el9 +- as: e2e-aws-tests-bootc-release-el9-x86 run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws @@ -368,7 +368,7 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-el10 +- as: e2e-aws-tests-bootc-release-el10-x86 run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws @@ -378,7 +378,7 @@ tests: SCENARIO_TYPE: bootc-releases-el10 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-el9 +- as: e2e-aws-tests-bootc-release-el9-arm run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws @@ -388,7 +388,7 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-el10 +- as: e2e-aws-tests-bootc-release-el10-arm run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws @@ -398,7 +398,7 @@ tests: SCENARIO_TYPE: bootc-releases-el10 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-upstream +- as: e2e-aws-tests-bootc-presubmit-upstream-x86 run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ steps: cluster_profile: openshift-org-aws @@ -407,7 +407,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: bootc-upstream workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-upstream-arm +- as: e2e-aws-tests-bootc-presubmit-upstream-arm run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ steps: cluster_profile: openshift-org-aws @@ -416,7 +416,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: bootc-upstream workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc +- as: e2e-aws-tests-bootc-presubmit-c2cc-x86 run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ steps: cluster_profile: openshift-org-aws @@ -425,7 +425,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-c2cc workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc-arm +- as: e2e-aws-tests-bootc-presubmit-c2cc-arm run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml index 43b6aaf976bb2..1f7dcec5350a7 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml @@ -99,7 +99,7 @@ tests: MICROSHIFT_OS: rhel-9.6 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests-bootc-nightly-el9-lifecycle +- as: e2e-aws-tests-bootc-x86-nightly-el9-lifecycle cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -108,7 +108,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el9-functional +- as: e2e-aws-tests-bootc-x86-nightly-el9-functional cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -117,7 +117,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-periodics-el9-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10-lifecycle +- as: e2e-aws-tests-bootc-x86-nightly-el10-lifecycle cron: 0 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -126,7 +126,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-periodics-el10-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10-functional +- as: e2e-aws-tests-bootc-x86-nightly-el10-functional cron: 30 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -171,7 +171,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc-nightly +- as: e2e-aws-tests-bootc-x86-nightly-c2cc cron: 30 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -180,7 +180,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-c2cc workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc-arm-nightly +- as: e2e-aws-tests-bootc-arm-nightly-c2cc cron: 30 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -189,7 +189,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-c2cc workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-nightly-lifecycle +- as: e2e-aws-tests-ostree-x86-nightly-el9-lifecycle cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -198,7 +198,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-nightly-functional +- as: e2e-aws-tests-ostree-x86-nightly-el9-functional cron: 0 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -207,7 +207,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: periodics-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly-lifecycle +- as: e2e-aws-tests-ostree-arm-nightly-el9-lifecycle cron: 45 3 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -216,7 +216,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly-functional +- as: e2e-aws-tests-ostree-arm-nightly-el9-functional cron: 15 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -301,7 +301,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SUITE: ai-model-serving workflow: openshift-microshift-e2e-bare-metal-tests -- as: e2e-aws-tests-release-periodic +- as: e2e-aws-tests-ostree-x86-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -311,7 +311,7 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-release-arm-periodic +- as: e2e-aws-tests-ostree-arm-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -321,7 +321,7 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-periodic-el9 +- as: e2e-aws-tests-bootc-x86-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -331,7 +331,7 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-periodic-el10 +- as: e2e-aws-tests-bootc-x86-release-periodic-el10 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -341,7 +341,7 @@ tests: SCENARIO_TYPE: bootc-releases-el10 TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-periodic-el9 +- as: e2e-aws-tests-bootc-arm-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -351,7 +351,7 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-periodic-el10 +- as: e2e-aws-tests-bootc-arm-release-periodic-el10 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml index 00fe201e40a54..ae2d1282f01f3 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml @@ -15,7 +15,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic-arm spec: containers: - args: @@ -24,7 +24,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream-periodic + - --target=e2e-aws-tests-bootc-upstream-periodic-arm command: - ci-operator env: @@ -96,7 +96,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic-arm + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic-x86 spec: containers: - args: @@ -105,7 +105,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream-periodic-arm + - --target=e2e-aws-tests-bootc-upstream-periodic-x86 command: - ci-operator env: @@ -179,7 +179,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly-arm reporter_config: slack: channel: '#microshift-alerts' @@ -196,7 +196,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly + - --target=e2e-aws-tests-cache-nightly-arm command: - ci-operator env: @@ -270,7 +270,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly-arm + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly-x86 reporter_config: slack: channel: '#microshift-alerts' @@ -287,7 +287,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly-arm + - --target=e2e-aws-tests-cache-nightly-x86 command: - ci-operator env: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml index e9a471a8ac07a..5fc4fa1acdc04 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml @@ -174,7 +174,7 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-functional-arm decorate: true decoration_config: skip_cloning: true @@ -184,9 +184,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests - rerun_command: /test e2e-aws-tests - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-functional-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ spec: containers: - args: @@ -195,7 +195,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests + - --target=e2e-aws-tests-bootc-periodic-el10-functional-arm command: - ci-operator env: @@ -251,14 +251,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-functional-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-arm + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-functional-x86 decorate: true decoration_config: skip_cloning: true @@ -268,9 +268,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-arm - rerun_command: /test e2e-aws-tests-arm - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-functional-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ spec: containers: - args: @@ -279,7 +279,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-arm + - --target=e2e-aws-tests-bootc-periodic-el10-functional-x86 command: - ci-operator env: @@ -335,14 +335,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-functional-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-arm-el10 + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-lifecycle-arm decorate: true decoration_config: skip_cloning: true @@ -352,9 +352,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm-el10 - rerun_command: /test e2e-aws-tests-bootc-arm-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ spec: containers: - args: @@ -363,7 +363,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-el10 + - --target=e2e-aws-tests-bootc-periodic-el10-lifecycle-arm command: - ci-operator env: @@ -419,14 +419,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-arm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-lifecycle-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-arm-el9 + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 decorate: true decoration_config: skip_cloning: true @@ -436,9 +436,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm-el9 - rerun_command: /test e2e-aws-tests-bootc-arm-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ spec: containers: - args: @@ -447,7 +447,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-el9 + - --target=e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 command: - ci-operator env: @@ -503,14 +503,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-arm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-lifecycle-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-c2cc + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-functional-arm decorate: true decoration_config: skip_cloning: true @@ -520,9 +520,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-c2cc - rerun_command: /test e2e-aws-tests-bootc-c2cc - run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-functional-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ spec: containers: - args: @@ -531,7 +531,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc + - --target=e2e-aws-tests-bootc-periodic-el9-functional-arm command: - ci-operator env: @@ -587,14 +587,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-c2cc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-functional-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-c2cc-arm + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-functional-x86 decorate: true decoration_config: skip_cloning: true @@ -604,9 +604,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-c2cc-arm - rerun_command: /test e2e-aws-tests-bootc-c2cc-arm - run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-functional-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ spec: containers: - args: @@ -615,7 +615,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc-arm + - --target=e2e-aws-tests-bootc-periodic-el9-functional-x86 command: - ci-operator env: @@ -671,14 +671,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-c2cc-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-functional-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-el10 + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-lifecycle-arm decorate: true decoration_config: skip_cloning: true @@ -688,9 +688,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el10 - rerun_command: /test e2e-aws-tests-bootc-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ spec: containers: - args: @@ -699,7 +699,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-el10 + - --target=e2e-aws-tests-bootc-periodic-el9-lifecycle-arm command: - ci-operator env: @@ -755,14 +755,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-lifecycle-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-el9 + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 decorate: true decoration_config: skip_cloning: true @@ -772,9 +772,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el9 - rerun_command: /test e2e-aws-tests-bootc-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ spec: containers: - args: @@ -783,7 +783,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-el9 + - --target=e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 command: - ci-operator env: @@ -839,14 +839,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-lifecycle-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-arm-el10 + context: ci/prow/e2e-aws-tests-bootc-presubmit-c2cc-arm decorate: true decoration_config: skip_cloning: true @@ -856,9 +856,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm-el10 - rerun_command: /test e2e-aws-tests-bootc-periodic-arm-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-c2cc-arm + rerun_command: /test e2e-aws-tests-bootc-presubmit-c2cc-arm + run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ spec: containers: - args: @@ -867,7 +867,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-arm-el10 + - --target=e2e-aws-tests-bootc-presubmit-c2cc-arm command: - ci-operator env: @@ -923,14 +923,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-arm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-c2cc-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-arm-el9 + context: ci/prow/e2e-aws-tests-bootc-presubmit-c2cc-x86 decorate: true decoration_config: skip_cloning: true @@ -940,9 +940,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm-el9 - rerun_command: /test e2e-aws-tests-bootc-periodic-arm-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-c2cc-x86 + rerun_command: /test e2e-aws-tests-bootc-presubmit-c2cc-x86 + run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ spec: containers: - args: @@ -951,7 +951,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-arm-el9 + - --target=e2e-aws-tests-bootc-presubmit-c2cc-x86 command: - ci-operator env: @@ -1007,14 +1007,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-arm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-c2cc-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-el10 + context: ci/prow/e2e-aws-tests-bootc-presubmit-upstream-arm decorate: true decoration_config: skip_cloning: true @@ -1024,9 +1024,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10 - rerun_command: /test e2e-aws-tests-bootc-periodic-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-upstream-arm + rerun_command: /test e2e-aws-tests-bootc-presubmit-upstream-arm + run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ spec: containers: - args: @@ -1035,7 +1035,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-el10 + - --target=e2e-aws-tests-bootc-presubmit-upstream-arm command: - ci-operator env: @@ -1091,14 +1091,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-upstream-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-el9 + context: ci/prow/e2e-aws-tests-bootc-presubmit-upstream-x86 decorate: true decoration_config: skip_cloning: true @@ -1108,9 +1108,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9 - rerun_command: /test e2e-aws-tests-bootc-periodic-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-upstream-x86 + rerun_command: /test e2e-aws-tests-bootc-presubmit-upstream-x86 + run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ spec: containers: - args: @@ -1119,7 +1119,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-el9 + - --target=e2e-aws-tests-bootc-presubmit-upstream-x86 command: - ci-operator env: @@ -1175,14 +1175,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-upstream-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-arm-el10 + context: ci/prow/e2e-aws-tests-bootc-release-el10-arm decorate: true decoration_config: skip_cloning: true @@ -1192,9 +1192,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-arm-el10 - rerun_command: /test e2e-aws-tests-bootc-release-arm-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el10-arm + rerun_command: /test e2e-aws-tests-bootc-release-el10-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1203,7 +1203,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-el10 + - --target=e2e-aws-tests-bootc-release-el10-arm command: - ci-operator env: @@ -1259,14 +1259,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-arm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el10-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-arm-el9 + context: ci/prow/e2e-aws-tests-bootc-release-el10-x86 decorate: true decoration_config: skip_cloning: true @@ -1276,9 +1276,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-arm-el9 - rerun_command: /test e2e-aws-tests-bootc-release-arm-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el10-x86 + rerun_command: /test e2e-aws-tests-bootc-release-el10-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1287,7 +1287,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-el9 + - --target=e2e-aws-tests-bootc-release-el10-x86 command: - ci-operator env: @@ -1343,14 +1343,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-arm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el10-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-el10 + context: ci/prow/e2e-aws-tests-bootc-release-el9-arm decorate: true decoration_config: skip_cloning: true @@ -1360,9 +1360,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el10 - rerun_command: /test e2e-aws-tests-bootc-release-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el9-arm + rerun_command: /test e2e-aws-tests-bootc-release-el9-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1371,7 +1371,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-el10 + - --target=e2e-aws-tests-bootc-release-el9-arm command: - ci-operator env: @@ -1427,14 +1427,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el9-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-el9 + context: ci/prow/e2e-aws-tests-bootc-release-el9-x86 decorate: true decoration_config: skip_cloning: true @@ -1444,9 +1444,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el9 - rerun_command: /test e2e-aws-tests-bootc-release-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el9-x86 + rerun_command: /test e2e-aws-tests-bootc-release-el9-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1455,7 +1455,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-el9 + - --target=e2e-aws-tests-bootc-release-el9-x86 command: - ci-operator env: @@ -1511,26 +1511,27 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el9-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-upstream + cluster: build05 + context: ci/prow/e2e-aws-tests-cache-arm decorate: true decoration_config: skip_cloning: true labels: + capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream - rerun_command: /test e2e-aws-tests-bootc-upstream - run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache-arm + rerun_command: /test e2e-aws-tests-cache-arm + run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ spec: containers: - args: @@ -1539,7 +1540,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream + - --target=e2e-aws-tests-cache-arm command: - ci-operator env: @@ -1595,26 +1596,27 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-upstream,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-cache-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-upstream-arm + cluster: build05 + context: ci/prow/e2e-aws-tests-cache-x86 decorate: true decoration_config: skip_cloning: true labels: + capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-arm - rerun_command: /test e2e-aws-tests-bootc-upstream-arm - run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache-x86 + rerun_command: /test e2e-aws-tests-cache-x86 + run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ spec: containers: - args: @@ -1623,7 +1625,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream-arm + - --target=e2e-aws-tests-cache-x86 command: - ci-operator env: @@ -1679,27 +1681,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-upstream-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-cache-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build05 - context: ci/prow/e2e-aws-tests-cache + cluster: build03 + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-functional-arm decorate: true decoration_config: skip_cloning: true labels: - capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache - rerun_command: /test e2e-aws-tests-cache - run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-functional-arm + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ spec: containers: - args: @@ -1708,7 +1709,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache + - --target=e2e-aws-tests-ostree-periodic-el9-functional-arm command: - ci-operator env: @@ -1764,27 +1765,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-cache,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-functional-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build05 - context: ci/prow/e2e-aws-tests-cache-arm + cluster: build03 + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-functional-x86 decorate: true decoration_config: skip_cloning: true labels: - capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache-arm - rerun_command: /test e2e-aws-tests-cache-arm - run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-functional-x86 + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ spec: containers: - args: @@ -1793,7 +1793,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-arm + - --target=e2e-aws-tests-ostree-periodic-el9-functional-x86 command: - ci-operator env: @@ -1849,14 +1849,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-cache-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-functional-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-periodic + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-lifecycle-arm decorate: true decoration_config: skip_cloning: true @@ -1866,9 +1866,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-periodic - rerun_command: /test e2e-aws-tests-periodic - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-lifecycle-arm + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ spec: containers: - args: @@ -1877,7 +1877,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-periodic + - --target=e2e-aws-tests-ostree-periodic-el9-lifecycle-arm command: - ci-operator env: @@ -1933,14 +1933,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-periodic,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-lifecycle-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-periodic-arm + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 decorate: true decoration_config: skip_cloning: true @@ -1950,9 +1950,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-periodic-arm - rerun_command: /test e2e-aws-tests-periodic-arm - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ spec: containers: - args: @@ -1961,7 +1961,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-periodic-arm + - --target=e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 command: - ci-operator env: @@ -2017,14 +2017,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-periodic-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-lifecycle-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-release + context: ci/prow/e2e-aws-tests-ostree-release-el9-arm decorate: true decoration_config: skip_cloning: true @@ -2034,9 +2034,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-release - rerun_command: /test e2e-aws-tests-release - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-release-el9-arm + rerun_command: /test e2e-aws-tests-ostree-release-el9-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -2045,7 +2045,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release + - --target=e2e-aws-tests-ostree-release-el9-arm command: - ci-operator env: @@ -2101,14 +2101,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-release,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-release-el9-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-release-arm + context: ci/prow/e2e-aws-tests-ostree-release-el9-x86 decorate: true decoration_config: skip_cloning: true @@ -2118,9 +2118,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-release-arm - rerun_command: /test e2e-aws-tests-release-arm - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-release-el9-x86 + rerun_command: /test e2e-aws-tests-ostree-release-el9-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -2129,7 +2129,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release-arm + - --target=e2e-aws-tests-ostree-release-el9-x86 command: - ci-operator env: @@ -2185,14 +2185,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-release-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-release-el9-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm-el9 + context: ci/prow/e2e-aws-tests-rpm-presubmit-el10-x86 decorate: true decoration_config: skip_cloning: true @@ -2202,8 +2202,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 - rerun_command: /test e2e-aws-tests-rpm-el9 + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el10-x86 + rerun_command: /test e2e-aws-tests-rpm-presubmit-el10-x86 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2213,7 +2213,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm-el9 + - --target=e2e-aws-tests-rpm-presubmit-el10-x86 command: - ci-operator env: @@ -2269,14 +2269,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el10-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm-el10 + context: ci/prow/e2e-aws-tests-rpm-presubmit-el9-x86 decorate: true decoration_config: skip_cloning: true @@ -2286,8 +2286,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 - rerun_command: /test e2e-aws-tests-rpm-el10 + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el9-x86 + rerun_command: /test e2e-aws-tests-rpm-presubmit-el9-x86 run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2297,7 +2297,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm-el10 + - --target=e2e-aws-tests-rpm-presubmit-el9-x86 command: - ci-operator env: @@ -2353,7 +2353,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el9-x86,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml index 545c1d0cb3992..730f6867b8edb 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml @@ -456,7 +456,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 30 3 * * 1-5 + cron: 30 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -471,15 +471,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-arm-nightly - reporter_config: - slack: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-c2cc spec: containers: - args: @@ -488,7 +480,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-arm-nightly + - --target=e2e-aws-tests-bootc-arm-nightly-c2cc - --variant=periodics command: - ci-operator @@ -547,7 +539,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 45 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -562,7 +554,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el10-functional spec: containers: - args: @@ -571,7 +563,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-nightly-el10 + - --target=e2e-aws-tests-bootc-arm-nightly-el10-functional - --variant=periodics command: - ci-operator @@ -630,7 +622,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 15 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -645,7 +637,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el10-lifecycle spec: containers: - args: @@ -654,7 +646,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-nightly-el9 + - --target=e2e-aws-tests-bootc-arm-nightly-el10-lifecycle - --variant=periodics command: - ci-operator @@ -713,7 +705,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 30 4 * * 1-5 + cron: 45 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -728,7 +720,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-c2cc-arm-nightly + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el9-functional spec: containers: - args: @@ -737,7 +729,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc-arm-nightly + - --target=e2e-aws-tests-bootc-arm-nightly-el9-functional - --variant=periodics command: - ci-operator @@ -796,7 +788,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 30 4 * * 1-5 + cron: 15 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -811,7 +803,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-c2cc-nightly + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el9-lifecycle spec: containers: - args: @@ -820,7 +812,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc-nightly + - --target=e2e-aws-tests-bootc-arm-nightly-el9-lifecycle - --variant=periodics command: - ci-operator @@ -879,7 +871,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 0 3 * * 0,2,4 decorate: true decoration_config: skip_cloning: true @@ -894,7 +886,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-nightly-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-release-periodic-el10 spec: containers: - args: @@ -903,7 +895,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-nightly-el10 + - --target=e2e-aws-tests-bootc-arm-release-periodic-el10 - --variant=periodics command: - ci-operator @@ -962,7 +954,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 0 3 * * 0,2,4 decorate: true decoration_config: skip_cloning: true @@ -977,7 +969,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-nightly-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-release-periodic-el9 spec: containers: - args: @@ -986,7 +978,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-nightly-el9 + - --target=e2e-aws-tests-bootc-arm-release-periodic-el9 - --variant=periodics command: - ci-operator @@ -1045,7 +1037,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 30 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1060,7 +1052,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-arm-periodic-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-c2cc spec: containers: - args: @@ -1069,7 +1061,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-periodic-el10 + - --target=e2e-aws-tests-bootc-x86-nightly-c2cc - --variant=periodics command: - ci-operator @@ -1128,7 +1120,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 30 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1143,7 +1135,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-arm-periodic-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el10-functional spec: containers: - args: @@ -1152,7 +1144,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-periodic-el9 + - --target=e2e-aws-tests-bootc-x86-nightly-el10-functional - --variant=periodics command: - ci-operator @@ -1211,7 +1203,173 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 0 4 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el10-lifecycle + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-bootc-x86-nightly-el10-lifecycle + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 30 3 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el9-functional + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-bootc-x86-nightly-el9-functional + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 0 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1226,7 +1384,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-periodic-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el9-lifecycle spec: containers: - args: @@ -1235,7 +1393,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-periodic-el10 + - --target=e2e-aws-tests-bootc-x86-nightly-el9-lifecycle - --variant=periodics command: - ci-operator @@ -1309,7 +1467,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-periodic-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-release-periodic-el10 spec: containers: - args: @@ -1318,7 +1476,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-periodic-el9 + - --target=e2e-aws-tests-bootc-x86-release-periodic-el10 - --variant=periodics command: - ci-operator @@ -1376,33 +1534,23 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build12 - cron: 30 0 * * 1-5 + cluster: build11 + cron: 0 3 * * 0,2,4 decorate: true decoration_config: skip_cloning: true - timeout: 4h0m0s extra_refs: - base_ref: release-5.0 org: openshift repo: microshift labels: - capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly - reporter_config: - slack: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-release-periodic-el9 spec: containers: - args: @@ -1411,7 +1559,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly + - --target=e2e-aws-tests-bootc-x86-release-periodic-el9 - --variant=periodics command: - ci-operator @@ -1487,7 +1635,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly-arm + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly reporter_config: slack: channel: '#microshift-alerts' @@ -1504,7 +1652,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly-arm + - --target=e2e-aws-tests-cache-nightly - --variant=periodics command: - ci-operator @@ -1562,23 +1710,25 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build11 - cron: 30 3 * * 1-5 + cluster: build12 + cron: 30 0 * * 1-5 decorate: true decoration_config: skip_cloning: true + timeout: 4h0m0s extra_refs: - base_ref: release-5.0 org: openshift repo: microshift labels: + capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-nightly + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly-arm reporter_config: slack: channel: '#microshift-alerts' @@ -1595,7 +1745,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-nightly + - --target=e2e-aws-tests-cache-nightly-arm - --variant=periodics command: - ci-operator @@ -1654,7 +1804,339 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 15 4 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-arm-nightly-el9-functional + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-arm-nightly-el9-functional + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 45 3 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-arm-nightly-el9-lifecycle + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-arm-nightly-el9-lifecycle + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 0 3 * * 0,2,4 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-arm-release-periodic-el9 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-arm-release-periodic-el9 + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 0 4 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-x86-nightly-el9-functional + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-x86-nightly-el9-functional + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 30 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1669,7 +2151,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-release-arm-periodic + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-x86-nightly-el9-lifecycle spec: containers: - args: @@ -1678,7 +2160,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release-arm-periodic + - --target=e2e-aws-tests-ostree-x86-nightly-el9-lifecycle - --variant=periodics command: - ci-operator @@ -1752,7 +2234,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-release-periodic + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-x86-release-periodic-el9 spec: containers: - args: @@ -1761,7 +2243,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release-periodic + - --target=e2e-aws-tests-ostree-x86-release-periodic-el9 - --variant=periodics command: - ci-operator diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 13858640bfdad..91371134be60d 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -755,11 +755,11 @@ function get_source_dir() { [bootc-periodics-el10-functional]="scenarios-bootc/el10/periodics-functional:scenarios-bootc" [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" [releases]="scenarios-ostree/releases:scenarios-ostree" + [periodics-lifecycle]="scenarios-ostree/periodics-lifecycle:scenarios-ostree" + [periodics-functional]="scenarios-ostree/periodics-functional:scenarios-ostree" # Both el9/el10 share the same scenarios — RHEL version is derived from SCENARIO_TYPE at runtime [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" - [periodics-lifecycle]="scenarios-ostree/periodics-lifecycle:scenarios-ostree" - [periodics-functional]="scenarios-ostree/periodics-functional:scenarios-ostree" ) local -r scenario_type=$1 local -r base="/home/${HOST_USER}/microshift/test" From 384b1f68c249d5197f2cd723dfa772ce22fcfe3d Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Thu, 2 Jul 2026 13:03:35 +0200 Subject: [PATCH 19/20] feat: switch RPM presubmit jobs from x86 to ARM (c7g.metal) ARM EC2 metal instances are cheaper than x86 equivalents. Rename rpm-presubmit-el{9,10}-x86 to -arm and change EC2_INSTANCE_TYPE from c5.metal to c7g.metal (Graviton3). Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../microshift/openshift-microshift-main.yaml | 8 ++++---- .../openshift-microshift-main-presubmits.yaml | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 59400610fa04a..a55e805644b4c 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -147,21 +147,21 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests-rpm-presubmit-el9-x86 +- as: e2e-aws-tests-rpm-presubmit-el9-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: c5.metal + EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: rpm-presubmits-el9 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-rpm-presubmit-el10-x86 +- as: e2e-aws-tests-rpm-presubmit-el10-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: c5.metal + EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: rpm-presubmits-el10 workflow: openshift-microshift-e2e-metal-tests diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml index 5fc4fa1acdc04..11faf04a2374b 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml @@ -2192,7 +2192,7 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm-presubmit-el10-x86 + context: ci/prow/e2e-aws-tests-rpm-presubmit-el10-arm decorate: true decoration_config: skip_cloning: true @@ -2202,8 +2202,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el10-x86 - rerun_command: /test e2e-aws-tests-rpm-presubmit-el10-x86 + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el10-arm + rerun_command: /test e2e-aws-tests-rpm-presubmit-el10-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2213,7 +2213,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm-presubmit-el10-x86 + - --target=e2e-aws-tests-rpm-presubmit-el10-arm command: - ci-operator env: @@ -2269,14 +2269,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el10-x86,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el10-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-rpm-presubmit-el9-x86 + context: ci/prow/e2e-aws-tests-rpm-presubmit-el9-arm decorate: true decoration_config: skip_cloning: true @@ -2286,8 +2286,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el9-x86 - rerun_command: /test e2e-aws-tests-rpm-presubmit-el9-x86 + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el9-arm + rerun_command: /test e2e-aws-tests-rpm-presubmit-el9-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: @@ -2297,7 +2297,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-rpm-presubmit-el9-x86 + - --target=e2e-aws-tests-rpm-presubmit-el9-arm command: - ci-operator env: @@ -2353,7 +2353,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el9-x86,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el9-arm,?($|\s.*) - agent: kubernetes always_run: true branches: From 0600858b1187f53c4d2427018b4e65da294a8d07 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Thu, 2 Jul 2026 13:31:40 +0200 Subject: [PATCH 20/20] fix: add missing -x86 suffix to cache-nightly periodic job Rename e2e-aws-tests-cache-nightly to e2e-aws-tests-cache-nightly-x86 for consistency with the naming convention requiring arch suffix on all jobs. Co-Authored-By: Claude Opus 4.6 pre-commit.check-secrets: ENABLED --- .../openshift-microshift-release-5.0__periodics.yaml | 2 +- .../openshift-microshift-release-5.0-periodics.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml index 1f7dcec5350a7..be0188ae655e9 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml @@ -62,7 +62,7 @@ tests: env: EC2_INSTANCE_TYPE: t3.medium workflow: openshift-microshift-manage-versions-releases -- as: e2e-aws-tests-cache-nightly +- as: e2e-aws-tests-cache-nightly-x86 capabilities: - intranet cron: 30 0 * * 1-5 diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml index 730f6867b8edb..6482bc9a88f71 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml @@ -1635,7 +1635,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly-arm reporter_config: slack: channel: '#microshift-alerts' @@ -1652,7 +1652,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly + - --target=e2e-aws-tests-cache-nightly-arm - --variant=periodics command: - ci-operator @@ -1728,7 +1728,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly-arm + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly-x86 reporter_config: slack: channel: '#microshift-alerts' @@ -1745,7 +1745,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly-arm + - --target=e2e-aws-tests-cache-nightly-x86 - --variant=periodics command: - ci-operator