Skip to content

RHOSDT-3.11: point disconnected job at 3.11 index images #84710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubenvp8510 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

RHOSDT-3.11: point disconnected job at 3.11 index images #84710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a11cd93
RHOSDT-3.11: point disconnected job at 3.11 index images
rubenvp8510 Sep 7, 2026
a7b2376
Use the brew IIB for Tempo instead of the Konflux FBC
rubenvp8510 Sep 7, 2026
1d69233
Set OO_INDEX to unblock enable-qe-catalogsource-disconnected
rubenvp8510 Sep 7, 2026
406de4c
Skip the QE catalogsource instead of overriding OO_INDEX
rubenvp8510 Sep 8, 2026
6eafdba
Disable the default OperatorHub sources in the disconnected install
rubenvp8510 Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ tests:
steps:
cluster_profile: gcp-observability
env:
MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155560
MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157120
MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1201675
MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1201014
OPERATORS: |
[
{"name": "amq-streams", "source": "cs-redhat-operator-index", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
{"name": "opentelemetry-product", "source": "cs-otel", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
{"name": "tempo-product", "source": "cs-tempo", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespaces": "", "operator_group": "openshift-tempo-operator"}
]
SELF_MANAGED_ADDITIONAL_CA: "true"
SELF_MANAGED_REGISTRY_CERT: "true"
SKIP_QE_APP_REGISTRY: "true"
test:
- ref: distributed-tracing-install-disconnected
- ref: install-operators
Expand Down
16 changes: 16 additions & 0 deletions ...ributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,25 @@ EOF

}

function disable_default_catalogsource () {
# The QE catalogsource step is skipped for this job (SKIP_QE_APP_REGISTRY),
# and that is also where the default OperatorHub sources used to be
# disabled. They are unreachable on a disconnected cluster and leave stale
# packagemanifests behind, so disable them here before creating cs-tempo
# and cs-otel.
run_command "oc patch operatorhub cluster -p '{\"spec\": {\"disableAllDefaultSources\": true}}' --type=merge"; ret=$?
if [[ $ret -eq 0 ]]; then
echo "disable default Catalog Source successfully."
else
echo "!!! fail to disable default Catalog Source"
return 1
fi
}

run_command "oc whoami"
run_command "oc version -o yaml"

check_olm_capability
check_marketplace
disable_default_catalogsource
mirror_catalog_icsp