diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh index edd486047..5fdc37109 100755 --- a/.ci/oci-devworkspace-happy-path.sh +++ b/.ci/oci-devworkspace-happy-path.sh @@ -73,32 +73,17 @@ deployDWO() { verifyOLMHealth() { echo "======== Verifying OLM Infrastructure ========" - # Check catalog-operator is available - echo "Checking catalog-operator..." - if ! kubectl wait --for=condition=available deployment/catalog-operator \ - -n openshift-operator-lifecycle-manager \ + # The catalog-operator/olm-operator deployments do not exist in a + # HyperShift hosted cluster on recent OCP releases: OLM v1 changed the + # component layout, and the hosted cluster is created with + # --olm-catalog-placement management (catalog sources live in the + # management cluster). The ClusterOperator resource is the + # version-agnostic health signal instead. + echo "Checking operator-lifecycle-manager ClusterOperator..." + if ! kubectl wait --for=condition=Available clusteroperator/operator-lifecycle-manager \ --timeout=120s 2>&1; then - echo "ERROR: catalog-operator is not ready" - kubectl get deployment/catalog-operator \ - -n openshift-operator-lifecycle-manager -o yaml || true - return 1 - fi - - # Check olm-operator is available - echo "Checking olm-operator..." - if ! kubectl wait --for=condition=available deployment/olm-operator \ - -n openshift-operator-lifecycle-manager \ - --timeout=120s 2>&1; then - echo "ERROR: olm-operator is not ready" - kubectl get deployment/olm-operator \ - -n openshift-operator-lifecycle-manager -o yaml || true - return 1 - fi - - # Verify marketplace is accessible - echo "Checking openshift-marketplace..." - if ! kubectl get catalogsources -n openshift-marketplace &>/dev/null; then - echo "ERROR: Cannot access CatalogSources in openshift-marketplace" + echo "ERROR: operator-lifecycle-manager ClusterOperator is not Available" + kubectl get clusteroperator operator-lifecycle-manager -o yaml || true return 1 fi diff --git a/.ci/oci.Dockerfile b/.ci/oci.Dockerfile index d426024bb..ce68b12f6 100644 --- a/.ci/oci.Dockerfile +++ b/.ci/oci.Dockerfile @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2025 Red Hat, Inc. +# Copyright (c) 2019-2026 Red Hat, Inc. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at