Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 13 additions & 2 deletions tests/e2e/common-operator-integ-suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,19 @@ install_operator() {
}

await_operator() {
echo "Awaiting sail-operator deployment on (KUBECONFIG=${KUBECONFIG})"
"${COMMAND}" wait --for=condition=available deployment/"${DEPLOYMENT_NAME}" -n "${NAMESPACE}" --timeout=5m
echo "Awaiting operator deployment on (KUBECONFIG=${KUBECONFIG})"
local name="${DEPLOYMENT_NAME}"
if [ "${OLM}" == "true" ]; then
local csv_name
local csv_file
csv_file=$(find "${WD}/../../bundle/manifests/" -name "*.clusterserviceversion.yaml" | head -1)
csv_name=$(yq eval '.spec.install.spec.deployments[0].name' "${csv_file}" 2>/dev/null || true)
if [ -n "${csv_name}" ]; then
echo "OLM mode: using deployment name from bundle CSV: ${csv_name}"
name="${csv_name}"
fi
Comment thread
fjglira marked this conversation as resolved.
fi
"${COMMAND}" wait --for=condition=available deployment/"${name}" -n "${NAMESPACE}" --timeout=5m
Comment thread
fjglira marked this conversation as resolved.
}

# shellcheck disable=SC2329 # Function is invoked indirectly via trap
Expand Down
Loading