Merge pull request #1558 from benluddy/install-flakes

Reduce install.sh flakiness.

Author: openshift-merge-robot

scripts/install.sh

@@ -15,21 +15,25 @@ release=$1
 url=https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${release}
 namespace=olm
 
-kubectl apply -f ${url}/crds.yaml
-kubectl apply -f ${url}/olm.yaml
+kubectl apply -f "${url}/crds.yaml"
+kubectl wait --for=condition=Established -f "${url}/crds.yaml"
+kubectl apply -f "${url}/olm.yaml"
 
 # wait for deployments to be ready
 kubectl rollout status -w deployment/olm-operator --namespace="${namespace}"
 kubectl rollout status -w deployment/catalog-operator --namespace="${namespace}"
 
-retries=50
-until [[ $retries == 0 || $new_csv_phase == "Succeeded" ]]; do
+retries=30
+until [[ $retries == 0 ]]; do
     new_csv_phase=$(kubectl get csv -n "${namespace}" packageserver -o jsonpath='{.status.phase}' 2>/dev/null || echo "Waiting for CSV to appear")
     if [[ $new_csv_phase != "$csv_phase" ]]; then
         csv_phase=$new_csv_phase
         echo "Package server phase: $csv_phase"
     fi
-    sleep 1
+    if [[ "$new_csv_phase" == "Succeeded" ]]; then
+	break
+    fi
+    sleep 10
     retries=$((retries - 1))
 done