test-cmd: don't hang in bash if SCCs fail to appear

stlaz · stlaz · commit 58a5bd91c538 · 2019-05-03T12:06:16.000+02:00
diff --git a/hack/local-up-master/lib.sh b/hack/local-up-master/lib.sh
@@ -258,7 +258,7 @@ function localup::start_kubecontrollermanager() {
         sleep 0.25
     done
     set -e
-    oc get --config="${LOCALUP_CONFIG}/kube-apiserver/admin.kubeconfig" --raw /apis/security.openshift.io/v1/securitycontextconstraints 2>/dev/null 1>&2 || bash
+    oc get --config="${LOCALUP_CONFIG}/kube-apiserver/admin.kubeconfig" --raw /apis/security.openshift.io/v1/securitycontextconstraints 1>&2 2>/dev/null || { os::log::error "SCCs did not come up" ; exit 1 ; }
 }
 
 function localup::start_openshiftapiserver() {

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ function localup::start_kubecontrollermanager() {`
`258`	`258`	`sleep 0.25`
`259`	`259`	`done`
`260`	`260`	`set -e`
`261`		`- oc get --config="${LOCALUP_CONFIG}/kube-apiserver/admin.kubeconfig" --raw /apis/security.openshift.io/v1/securitycontextconstraints 2>/dev/null 1>&2 \|\| bash`
	`261`	`+ oc get --config="${LOCALUP_CONFIG}/kube-apiserver/admin.kubeconfig" --raw /apis/security.openshift.io/v1/securitycontextconstraints 1>&2 2>/dev/null \|\| { os::log::error "SCCs did not come up" ; exit 1 ; }`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`function localup::start_openshiftapiserver() {`