Address review feedback on operator e2e steps

- Guard SHARED_DIR expansion with nounset-safe check
- Use bash array for Ginkgo args to prevent word splitting
- Add configurable OPERATOR_DEPLOYMENT_NAME for operators
  whose deployment name differs from the operator name

Author: dustman9000

ci-operator/step-registry/rosa/operator/e2e/rosa-operator-e2e-commands.sh

@@ -17,7 +17,7 @@ fi
 
 # Get cluster access: prefer shared kubeconfig from provision step,
 # fall back to backplane for persistent clusters
-if [[ -f "${SHARED_DIR}/kubeconfig" ]]; then
+if [[ -n "${SHARED_DIR:-}" && -f "${SHARED_DIR}/kubeconfig" ]]; then
     log "Using kubeconfig from provision step"
     export KUBECONFIG="${SHARED_DIR}/kubeconfig"
 elif [[ -n "${OPERATOR_E2E_CLUSTER_ID:-}" ]]; then
@@ -50,14 +50,14 @@ log "Connected to cluster: $(oc whoami --show-server)"
 
 # Run the operator e2e tests
 JUNIT_REPORT="${ARTIFACT_DIR}/junit-${OPERATOR_NAME}-e2e.xml"
-GINKGO_FLAGS="--ginkgo.junit-report=${JUNIT_REPORT} --ginkgo.v"
+GINKGO_ARGS=("--ginkgo.junit-report=${JUNIT_REPORT}" "--ginkgo.v")
 
 if [[ -n "${GINKGO_LABEL_FILTER:-}" ]]; then
-    GINKGO_FLAGS="${GINKGO_FLAGS} --ginkgo.label-filter=${GINKGO_LABEL_FILTER}"
+    GINKGO_ARGS+=("--ginkgo.label-filter=${GINKGO_LABEL_FILTER}")
 fi
 
 log "Running ${OPERATOR_NAME} e2e tests..."
-/usr/local/bin/e2e.test ${GINKGO_FLAGS} || {
+/usr/local/bin/e2e.test "${GINKGO_ARGS[@]}" || {
     log "Tests failed. JUnit report at ${JUNIT_REPORT}"
     exit 1
 }

ci-operator/step-registry/rosa/operator/install/rosa-operator-install-commands.sh

@@ -11,7 +11,7 @@ log(){
 }
 
 # Use shared kubeconfig from provision step if available
-if [[ -f "${SHARED_DIR}/kubeconfig" ]]; then
+if [[ -n "${SHARED_DIR:-}" && -f "${SHARED_DIR}/kubeconfig" ]]; then
     export KUBECONFIG="${SHARED_DIR}/kubeconfig"
 fi
 
@@ -31,6 +31,7 @@ if [[ -z "${OPERATOR_IMAGE:-}" ]]; then
 fi
 
 OPERATOR_NAMESPACE="${OPERATOR_NAMESPACE:-openshift-${OPERATOR_NAME}}"
+OPERATOR_DEPLOYMENT_NAME="${OPERATOR_DEPLOYMENT_NAME:-${OPERATOR_NAME}}"
 
 log "Installing ${OPERATOR_NAME} via PKO ClusterPackage"
 log "  PKO image: ${OPERATOR_PKO_IMAGE}"
@@ -61,8 +62,8 @@ spec:
 EOF
 
 # Wait for the operator deployment to be available
-log "Waiting for ${OPERATOR_NAME} deployment to be ready..."
-oc wait deployment "${OPERATOR_NAME}" \
+log "Waiting for deployment ${OPERATOR_DEPLOYMENT_NAME} to be ready..."
+oc wait deployment "${OPERATOR_DEPLOYMENT_NAME}" \
     -n "${OPERATOR_NAMESPACE}" \
     --for=condition=Available \
     --timeout=300s

ci-operator/step-registry/rosa/operator/install/rosa-operator-install-ref.yaml

@@ -21,6 +21,9 @@ ref:
   - name: OPERATOR_NAMESPACE
     default: ""
     documentation: Namespace for the operator. Defaults to openshift-<OPERATOR_NAME>.
+  - name: OPERATOR_DEPLOYMENT_NAME
+    default: ""
+    documentation: Name of the deployment to wait on. Defaults to OPERATOR_NAME.
   - name: OPERATOR_CRD_DIR
     default: ""
     documentation: Path to directory containing CRD manifests to pre-apply. Optional.