From cdf95e7c3b203212e904a14a6b1c0648f84c509d Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Sat, 25 Jul 2026 09:42:34 -0400 Subject: [PATCH] test/e2e: unpin optional-operators fixture from EOL ocp/4.6 integrated stream The e2e-oo suite has failed on every run since at least February 2026: the fixture's tag_specification pins the ocp/4.6 integrated stream, which configresolver no longer serves, so every ci-operator invocation dies at startup with: failed to generate integrated streams: failed to get integrated stream ocp/4.6: got unexpected http 400 status code from configresolver: not a valid integrated stream: ocp/4.6 Bump the integrated stream to ocp/4.20 and point the substitutions that referenced metering components (which no longer exist in current release streams) at components present in every modern stream (cli, machine-config-operator). The substitution pullspec strings are unchanged so they keep matching the bundle manifests under test/manifests/4.6. The base_index (ci/redhat-operator-index:v4.6) and the CSV names asserted by the verify-db steps are left untouched: they describe the content of the test's own bundle and base index, not the release stream. Fixes #5333 Co-Authored-By: Claude Fable 5 Signed-off-by: Tiger Kaovilai --- test/e2e/optional-operators/optional-operators.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/optional-operators/optional-operators.yaml b/test/e2e/optional-operators/optional-operators.yaml index 6f48ce161cd..734efb051fc 100644 --- a/test/e2e/optional-operators/optional-operators.yaml +++ b/test/e2e/optional-operators/optional-operators.yaml @@ -30,14 +30,14 @@ operator: skip_building_index: true substitutions: - pullspec: quay.io/openshift/origin-metering-reporting-operator:4.6 - with: metering-reporting-operator # another `images:` list item + with: cli # OCP component, replaces a pullspec present in the bundle manifests - pullspec: quay.io/openshift/origin-oauth-proxy:4.6 - with: oauth-proxy # OCP component - - pullspec: quay.io/openshift/origin-hive:4.6 - with: metering-hive # operand image, must be present in `stable` imagestream + with: oauth-proxy # OCP component, replaces a pullspec present in the bundle manifests + - pullspec: quay.io/openshift/substitution-not-in-manifests:1.0 # intentionally matches nothing in test/manifests: this substitution only exercises resolving `with` from the stable imagestream (and that the resulting sed is a harmless no-op) + with: machine-config-operator # operand image, must be present in `stable` imagestream tag_specification: namespace: ocp - name: "4.6" + name: "4.20" tests: - as: verify-db-unnamed literal_steps: