Skip to content

ci: fix OLM health check and launcher failure classification for HyperShift CI #1734

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

Merged
artaleks9 merged 2 commits into from
Nov 10, 2026
+11 −26
Merged

ci: fix OLM health check and launcher failure classification for HyperShift CI #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
917e14b
ci: fix OLM health check for HyperShift hosted clusters on OCP 4.22
artaleks9 Nov 6, 2026
e491ab4
ci: bump copyright year in oci.Dockerfile
artaleks9 Nov 6, 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
35 changes: 10 additions & 25 deletions .ci/oci-devworkspace-happy-path.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .ci/oci.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading