@@ -107,6 +107,12 @@ function test_privileges {

   set -e

 }

+# tryuntil loops up to 60 seconds to redo this action

+function tryuntil {

+  timeout=$(($(date +%s) + 60))

+  until eval "${@}" || [[ $(date +%s) -gt $timeout ]]; do :; done

+}

+

 # wait_for_command executes a command and waits for it to

 # complete or times out after max_wait.

 #

@@ -4,10 +4,9 @@ set -o errexit

 set -o nounset

 set -o pipefail

-function tryuntil {

-  timeout=$(($(date +%s) + 60))

-  until eval "${@}" || [[ $(date +%s) -gt $timeout ]]; do :; done

-}

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

 # Cleanup cluster resources created by this test

 (

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 # This test validates basic resource retrieval and command interaction

 # Test resource builder filtering of files with expected extensions inside directories, and individual files without expected extensions

@@ -23,7 +27,7 @@ oc delete pods hello-openshift

 echo "pods: ok"

 oc create -f examples/hello-openshift/hello-pod.json

-oc label pod/hello-openshift acustom=label

+tryuntil oc label pod/hello-openshift acustom=label # can race against scheduling and status updates

 [ "$(oc describe pod/hello-openshift | grep 'acustom=label')" ]

 oc delete pods -l acustom=label

 [ ! "$(oc get pod/hello-openshift)" ]

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 url=":${API_PORT:-8443}"

 project="$(oc project -q)"

@@ -4,10 +4,9 @@ set -o errexit

 set -o nounset

 set -o pipefail

-function tryuntil {

-  timeout=$(($(date +%s) + 60))

-  until eval "${@}" || [[ $(date +%s) -gt $timeout ]]; do :; done

-}

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

 # This test validates deployments

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 # This test validates the edit command

 oc create -f examples/hello-openshift/hello-pod.json

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 # This test validates the export command

 oc new-app -f examples/sample-app/application-template-stibuild.json --name=sample

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 # This test validates the help commands and output text

 # verify some default commands

@@ -4,10 +4,9 @@ set -o errexit

 set -o nounset

 set -o pipefail

-function tryuntil {

-  timeout=$(($(date +%s) + 60))

-  until eval "${@}" || [[ $(date +%s) -gt $timeout ]]; do :; done

-}

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

 # Cleanup cluster resources created by this test

 (

@@ -4,10 +4,9 @@ set -o errexit

 set -o nounset

 set -o pipefail

-function tryuntil {

-  timeout=$(($(date +%s) + 60))

-  until eval "${@}" || [[ $(date +%s) -gt $timeout ]]; do :; done

-}

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

 # This test validates the new-app command

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 # This test validates user level policy

 oc policy add-role-to-group cluster-admin system:unauthenticated

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 # This test validates secret interaction

 oc secrets new-dockercfg dockercfg --docker-username=sample-user --docker-password=sample-password --docker-email=fake@example.org

@@ -4,6 +4,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 # This test validates template commands

 oc get templates