oc: start-build waits only if --wait flag is set

Author: adambkaplan

pkg/oc/cli/cmd/startbuild.go

@@ -440,7 +440,7 @@ func (o *StartBuildOptions) Run() error {
 		}
 	}
 
-	if o.Follow || o.WaitForComplete {
+	if o.WaitForComplete {
 		return WaitForBuildComplete(o.BuildClient.Builds(o.Namespace), newBuild.Name)
 	}
 

test/extended/gssapi.sh

@@ -62,7 +62,7 @@ os::cmd::expect_success "oc create -f '${test_data_location}/proxy'"
 
 # kick off a build and wait for it to finish
 os::cmd::expect_success "oc set env dc/gssapiproxy-server HOST='${host}' REALM='${realm}' BACKEND='${backend}'"
-os::cmd::expect_success "oc start-build --from-dir='${test_data_location}/proxy' --follow gssapiproxy"
+os::cmd::expect_success "oc start-build --from-dir='${test_data_location}/proxy' --follow --wait gssapiproxy"
 
 os_images=(fedora ubuntu)
 

test/extended/ldap_groups.sh

@@ -54,7 +54,7 @@ os::test::junit::declare_suite_start "extended/ldap-groups/setup"
 os::cmd::try_until_text "oc get imagestream openldap --template='${is_event_template}'" 'latest' "$((60*TIME_SEC))"
 
 # kick off a build and wait for it to finish
-oc start-build openldap --follow
+oc start-build openldap --follow --wait
 
 server_ready_template=(                                  \
 "{{with \$items := .items}}"                             \