diff --git a/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml b/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml index d64ac7e11d9fa..5a98af6729c05 100644 --- a/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml +++ b/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml @@ -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 diff --git a/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh b/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh index 1940f18be692a..50cc155042505 100644 --- a/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh +++ b/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh @@ -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