From a503bb9cdf069e6ad953104d3c5f63c1620ea9ab Mon Sep 17 00:00:00 2001 From: Evelyn Tanigawa Murasaki Date: Thu, 13 Aug 2026 16:41:16 -0300 Subject: [PATCH 1/3] e2e only in main-alerts branch --- .../monitoring-plugin/openshift-monitoring-plugin-main.yaml | 2 -- .../openshift-monitoring-plugin-main-presubmits.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml index e9ecffda401aa..04b781ff0ca3f 100644 --- a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml +++ b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml @@ -154,8 +154,6 @@ tests: workflow: ipi-aws - always_run: false as: e2e-management-api - skip_branches: - - ^main$ steps: cluster_profile: openshift-org-aws test: diff --git a/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml b/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml index 0b363374cc5d2..9c365df4941bb 100644 --- a/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml @@ -747,8 +747,6 @@ presubmits: pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-monitoring-plugin-main-e2e-management-api rerun_command: /test e2e-management-api - skip_branches: - - ^main$ spec: containers: - args: From 8ab543876207852d5affc44249c119dc5cb94143 Mon Sep 17 00:00:00 2001 From: Evelyn Tanigawa Murasaki Date: Thu, 13 Aug 2026 17:04:06 -0300 Subject: [PATCH 2/3] excluding main --- .../openshift-monitoring-plugin-main-presubmits.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml b/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml index 9c365df4941bb..8f32f39ec573e 100644 --- a/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml @@ -728,7 +728,6 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^main$ - ^main- cluster: build01 context: ci/prow/e2e-management-api From 224140ebcafc24a344701e32c3ddfa838216c34d Mon Sep 17 00:00:00 2001 From: Evelyn Tanigawa Murasaki Date: Thu, 13 Aug 2026 17:56:24 -0300 Subject: [PATCH 3/3] optional true --- .../monitoring-plugin/openshift-monitoring-plugin-main.yaml | 3 +++ .../openshift-monitoring-plugin-main-presubmits.yaml | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml index 04b781ff0ca3f..73fe66280ecc4 100644 --- a/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml +++ b/ci-operator/config/openshift/monitoring-plugin/openshift-monitoring-plugin-main.yaml @@ -154,6 +154,9 @@ tests: workflow: ipi-aws - always_run: false as: e2e-management-api + optional: true + skip_branches: + - ^main$ steps: cluster_profile: openshift-org-aws test: diff --git a/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml b/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml index 8f32f39ec573e..755a48df7aff5 100644 --- a/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/monitoring-plugin/openshift-monitoring-plugin-main-presubmits.yaml @@ -728,6 +728,7 @@ presubmits: - agent: kubernetes always_run: false branches: + - ^main$ - ^main- cluster: build01 context: ci/prow/e2e-management-api @@ -745,7 +746,10 @@ presubmits: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-monitoring-plugin-main-e2e-management-api + optional: true rerun_command: /test e2e-management-api + skip_branches: + - ^main$ spec: containers: - args: @@ -810,7 +814,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(e2e-management-api|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )e2e-management-api,?($|\s.*) - agent: kubernetes always_run: false branches: