From 568efef2d60c38a9766d84556b52ed8c1a92ab18 Mon Sep 17 00:00:00 2001 From: David Vail Date: Thu, 18 Jun 2026 14:21:42 -0400 Subject: [PATCH 1/3] Skip nongroovy and upgrade e2e tests for UI-only PRs --- .../config/stackrox/stackrox/stackrox-stackrox-master.yaml | 2 ++ .../stackrox/stackrox-stackrox-master__ocp-4-12.yaml | 1 + .../stackrox/stackrox-stackrox-master__ocp-4-21.yaml | 1 + .../stackrox/stackrox-stackrox-master__ocp-4-22.yaml | 1 + .../stackrox/stackrox-stackrox-master-presubmits.yaml | 5 +++++ 5 files changed, 10 insertions(+) diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml index ce2a56179903a..c2914af45dd43 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml @@ -102,6 +102,7 @@ tests: workflow: stackrox-stackrox-e2e-job - always_run: true as: gke-nongroovy-e2e-tests + skip_if_only_changed: ^ui/ steps: env: COLLECTION_METHOD: core_bpf @@ -155,6 +156,7 @@ tests: - always_run: true as: gke-upgrade-tests optional: true + skip_if_only_changed: ^ui/ steps: workflow: stackrox-stackrox-e2e-job - always_run: false diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml index 172399bab51e2..8cf0ecad684e2 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml @@ -63,6 +63,7 @@ tests: - always_run: true as: nongroovy-e2e-tests optional: true + skip_if_only_changed: ^ui/ steps: env: COLLECTION_METHOD: core_bpf diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml index f78d8243f58d2..ba40f1a651e87 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml @@ -77,6 +77,7 @@ tests: - always_run: true as: nongroovy-e2e-tests optional: true + skip_if_only_changed: ^ui/ steps: env: COLLECTION_METHOD: core_bpf diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml index e0fd11d863ee5..b6860869b2f06 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml @@ -77,6 +77,7 @@ tests: - always_run: true as: nongroovy-e2e-tests optional: true + skip_if_only_changed: ^ui/ steps: env: COLLECTION_METHOD: core_bpf diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml index b5dd302cb4666..d6d40604a55e8 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml @@ -744,6 +744,7 @@ presubmits: pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-stackrox-stackrox-master-gke-nongroovy-e2e-tests rerun_command: /test gke-nongroovy-e2e-tests + skip_if_only_changed: ^ui/ spec: containers: - args: @@ -1637,6 +1638,7 @@ presubmits: name: pull-ci-stackrox-stackrox-master-gke-upgrade-tests optional: true rerun_command: /test gke-upgrade-tests + skip_if_only_changed: ^ui/ spec: containers: - args: @@ -2201,6 +2203,7 @@ presubmits: name: pull-ci-stackrox-stackrox-master-ocp-4-12-nongroovy-e2e-tests optional: true rerun_command: /test ocp-4-12-nongroovy-e2e-tests + skip_if_only_changed: ^ui/ spec: containers: - args: @@ -2737,6 +2740,7 @@ presubmits: name: pull-ci-stackrox-stackrox-master-ocp-4-21-nongroovy-e2e-tests optional: true rerun_command: /test ocp-4-21-nongroovy-e2e-tests + skip_if_only_changed: ^ui/ spec: containers: - args: @@ -3351,6 +3355,7 @@ presubmits: name: pull-ci-stackrox-stackrox-master-ocp-4-22-nongroovy-e2e-tests optional: true rerun_command: /test ocp-4-22-nongroovy-e2e-tests + skip_if_only_changed: ^ui/ spec: containers: - args: From ca77ba9f77030d54a052b84baeac49386826df37 Mon Sep 17 00:00:00 2001 From: David Vail Date: Thu, 18 Jun 2026 15:33:06 -0400 Subject: [PATCH 2/3] Remove always_run: true from jobs with skip_if_only_changed --- .../config/stackrox/stackrox/stackrox-stackrox-master.yaml | 6 ++---- .../stackrox/stackrox-stackrox-master__ocp-4-12.yaml | 3 +-- .../stackrox/stackrox-stackrox-master__ocp-4-21.yaml | 3 +-- .../stackrox/stackrox-stackrox-master__ocp-4-22.yaml | 3 +-- .../stackrox/stackrox-stackrox-master-presubmits.yaml | 5 ----- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml index c2914af45dd43..0cc3d4df3dac0 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master.yaml @@ -100,8 +100,7 @@ tests: GKE_CLUSTER_VERSION: latest TEST_SUITE: gke-ui-e2e-tests workflow: stackrox-stackrox-e2e-job -- always_run: true - as: gke-nongroovy-e2e-tests +- as: gke-nongroovy-e2e-tests skip_if_only_changed: ^ui/ steps: env: @@ -153,8 +152,7 @@ tests: GKE_CLUSTER_VERSION: latest TEST_SUITE: gke-operator-e2e-tests workflow: stackrox-stackrox-e2e-job -- always_run: true - as: gke-upgrade-tests +- as: gke-upgrade-tests optional: true skip_if_only_changed: ^ui/ steps: diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml index 8cf0ecad684e2..19724f7e5a07b 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-12.yaml @@ -60,8 +60,7 @@ tests: OCP_VERSION: ocp/stable-4.12 TEST_SUITE: ocp-compliance-e2e-tests workflow: stackrox-automation-flavors-ocp-4-e2e -- always_run: true - as: nongroovy-e2e-tests +- as: nongroovy-e2e-tests optional: true skip_if_only_changed: ^ui/ steps: diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml index ba40f1a651e87..062c13fa76605 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-21.yaml @@ -74,8 +74,7 @@ tests: OCP_VERSION: ocp/candidate-4.21 TEST_SUITE: ocp-compliance-e2e-tests workflow: stackrox-automation-flavors-ocp-4-e2e -- always_run: true - as: nongroovy-e2e-tests +- as: nongroovy-e2e-tests optional: true skip_if_only_changed: ^ui/ steps: diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml index b6860869b2f06..d30c388427599 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-master__ocp-4-22.yaml @@ -74,8 +74,7 @@ tests: OCP_VERSION: ocp/candidate-4.22 TEST_SUITE: ocp-compliance-e2e-tests workflow: stackrox-automation-flavors-ocp-4-e2e -- always_run: true - as: nongroovy-e2e-tests +- as: nongroovy-e2e-tests optional: true skip_if_only_changed: ^ui/ steps: diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml index d6d40604a55e8..530ece2416cc0 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml @@ -730,7 +730,6 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )gke-nongroovy-compatibility-tests,?($|\s.*) - agent: kubernetes - always_run: true branches: - ^master$ - ^master- @@ -1623,7 +1622,6 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )gke-ui-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true branches: - ^master$ - ^master- @@ -2187,7 +2185,6 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-12-compliance-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true branches: - ^master$ - ^master- @@ -2724,7 +2721,6 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-21-fips-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true branches: - ^master$ - ^master- @@ -3339,7 +3335,6 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-22-fips-qa-e2e-tests,?($|\s.*) - agent: kubernetes - always_run: true branches: - ^master$ - ^master- From d104ee91501f3e62ecd1c77272fbf8e7646dcd37 Mon Sep 17 00:00:00 2001 From: David Vail Date: Thu, 18 Jun 2026 15:44:24 -0400 Subject: [PATCH 3/3] Set always_run: false explicitly to match prowgen output --- .../stackrox/stackrox-stackrox-master-presubmits.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml index 530ece2416cc0..8a602cfed06e4 100644 --- a/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml +++ b/ci-operator/jobs/stackrox/stackrox/stackrox-stackrox-master-presubmits.yaml @@ -730,6 +730,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )gke-nongroovy-compatibility-tests,?($|\s.*) - agent: kubernetes + always_run: false branches: - ^master$ - ^master- @@ -1622,6 +1623,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )gke-ui-e2e-tests,?($|\s.*) - agent: kubernetes + always_run: false branches: - ^master$ - ^master- @@ -2185,6 +2187,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-12-compliance-e2e-tests,?($|\s.*) - agent: kubernetes + always_run: false branches: - ^master$ - ^master- @@ -2721,6 +2724,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-21-fips-qa-e2e-tests,?($|\s.*) - agent: kubernetes + always_run: false branches: - ^master$ - ^master- @@ -3335,6 +3339,7 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )ocp-4-22-fips-qa-e2e-tests,?($|\s.*) - agent: kubernetes + always_run: false branches: - ^master$ - ^master-