diff --git a/hack/lib/start.sh b/hack/lib/start.sh index 5bb9567808f1..1041deb12232 100644 --- a/hack/lib/start.sh +++ b/hack/lib/start.sh @@ -522,15 +522,11 @@ function os::start::internal::openshift_executable() { openshift_executable="${sudo} docker run ${docker_options} ${volumes} ${envvars} openshift/origin:${version}" else - local envvars="" - if [[ -n "${ENV:-}" ]]; then - envvars="env " - for envvar in "${ENV[@]}"; do - envvars+="${envvar} " - done - fi - - openshift_executable="${sudo} ${envvars} $(which openshift)" + if [[ -n "${sudo}" ]]; then + openshift_executable="${sudo} -E $(which openshift)" + else + openshift_executable="$(which openshift)" + fi fi echo "${openshift_executable}" diff --git a/test/cmd/admin.sh b/test/cmd/admin.sh index 283fdb09b869..0a2e92af8d8a 100755 --- a/test/cmd/admin.sh +++ b/test/cmd/admin.sh @@ -18,7 +18,7 @@ trap os::test::junit::reconcile_output EXIT oc delete identities/anypassword:cascaded-user oc adm policy reconcile-cluster-roles --confirm --additive-only=false oc adm policy reconcile-cluster-role-bindings --confirm --additive-only=false -) &>/dev/null +) project="$( oc project -q )" diff --git a/test/cmd/annotations.sh b/test/cmd/annotations.sh index b1027ba109ea..165c3f0bc660 100755 --- a/test/cmd/annotations.sh +++ b/test/cmd/annotations.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/annotate" diff --git a/test/cmd/authentication.sh b/test/cmd/authentication.sh index 58d0172557f2..b7d8ab567aca 100755 --- a/test/cmd/authentication.sh +++ b/test/cmd/authentication.sh @@ -11,10 +11,10 @@ fi # Cleanup cluster resources created by this test ( set +e - oc delete oauthaccesstokens --all + oc delete oauthaccesstokens --all --loglevel=8 oc adm policy remove-cluster-role-from-user cluster-debugger user3 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/authentication" diff --git a/test/cmd/basicresources.sh b/test/cmd/basicresources.sh index 52f611937045..f78f3db549a3 100755 --- a/test/cmd/basicresources.sh +++ b/test/cmd/basicresources.sh @@ -8,9 +8,9 @@ trap os::test::junit::reconcile_output EXIT oc delete all,templates,secrets,pods,jobs --all oc delete image v1-image oc delete group patch-group - oc delete project test-project-admin + oc delete project test-project-admin --loglevel=8 exit 0 -) &>/dev/null +) function escape_regex() { sed 's/[]\.|$(){}?+*^]/\\&/g' <<< "$*" diff --git a/test/cmd/builds.sh b/test/cmd/builds.sh index dce5d15f408e..015b494ae733 100755 --- a/test/cmd/builds.sh +++ b/test/cmd/builds.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) url=":${API_PORT:-8443}" diff --git a/test/cmd/config.sh b/test/cmd/config.sh index 089e8bdf8ade..1fa4245b9e14 100755 --- a/test/cmd/config.sh +++ b/test/cmd/config.sh @@ -12,9 +12,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates,secrets --all + oc delete all,templates,secrets --all --loglevel=8 exit 0 -) &>/dev/null +) # check to make sure that "get"ting a resource with no config file present # still returns error indicating that no config-file is set diff --git a/test/cmd/convert.sh b/test/cmd/convert.sh index 4a445827662e..ef463a775eca 100755 --- a/test/cmd/convert.sh +++ b/test/cmd/convert.sh @@ -12,9 +12,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all --all + oc delete all --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/convert" # This test validates the convert command diff --git a/test/cmd/create.sh b/test/cmd/create.sh index 4a9cc975d8b5..2b876eb4a761 100755 --- a/test/cmd/create.sh +++ b/test/cmd/create.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/create" diff --git a/test/cmd/debug.sh b/test/cmd/debug.sh index b090fff92ffd..91418c88d1d4 100755 --- a/test/cmd/debug.sh +++ b/test/cmd/debug.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/debug" # This test validates the debug command diff --git a/test/cmd/deployments.sh b/test/cmd/deployments.sh index cbe49f9a5ce7..46fd70271304 100755 --- a/test/cmd/deployments.sh +++ b/test/cmd/deployments.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/deployments" diff --git a/test/cmd/describer.sh b/test/cmd/describer.sh index 1de09a95d629..62d0fcea8d68 100755 --- a/test/cmd/describer.sh +++ b/test/cmd/describer.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/describe" diff --git a/test/cmd/dns.sh b/test/cmd/dns.sh index 70e8d80bee90..cc2180e7a4ab 100755 --- a/test/cmd/dns.sh +++ b/test/cmd/dns.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete svc,endpoints --all + oc delete svc,endpoints --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/dns" diff --git a/test/cmd/edit.sh b/test/cmd/edit.sh index affa62f2130c..418970f334db 100755 --- a/test/cmd/edit.sh +++ b/test/cmd/edit.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/edit" diff --git a/test/cmd/explain.sh b/test/cmd/explain.sh index 65c1a62c1da2..badfc9f26abb 100755 --- a/test/cmd/explain.sh +++ b/test/cmd/explain.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/explain" diff --git a/test/cmd/export.sh b/test/cmd/export.sh index ada77e7d512e..fba3cc711ed8 100755 --- a/test/cmd/export.sh +++ b/test/cmd/export.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/export" diff --git a/test/cmd/get.sh b/test/cmd/get.sh index 1c5e240c0d60..9b385ed104a5 100755 --- a/test/cmd/get.sh +++ b/test/cmd/get.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/get" diff --git a/test/cmd/idle.sh b/test/cmd/idle.sh index 418c736b0556..c38ef88dabb3 100755 --- a/test/cmd/idle.sh +++ b/test/cmd/idle.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) project="$(oc project -q)" idled_at_annotation='idling.alpha.openshift.io/idled-at' diff --git a/test/cmd/image-lookup.sh b/test/cmd/image-lookup.sh index 82e770900e0f..b468ad8de5a6 100755 --- a/test/cmd/image-lookup.sh +++ b/test/cmd/image-lookup.sh @@ -5,10 +5,10 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,is,pods --all + oc delete all,is,pods --all --loglevel=8 exit 0 -) &> /dev/null +) project="$( oc project -q )" diff --git a/test/cmd/images.sh b/test/cmd/images.sh index e7f2b843bc63..032cfe06cc5e 100755 --- a/test/cmd/images.sh +++ b/test/cmd/images.sh @@ -9,11 +9,11 @@ trap os::test::junit::reconcile_output EXIT os::cmd::expect_success 'oc login -u system:admin' cluster_admin_context="$( oc config current-context )" os::cmd::expect_success "oc config use-context '${original_context}'" - oc delete project test-cmd-images-2 merge-tags --context=${cluster_admin_context} - oc delete all,templates --all --context=${cluster_admin_context} + oc delete project test-cmd-images-2 merge-tags --context=${cluster_admin_context} --loglevel=8 + oc delete all,templates --all --context=${cluster_admin_context} --loglevel=8 exit 0 -) &> /dev/null +) project="$( oc project -q )" diff --git a/test/cmd/login.sh b/test/cmd/login.sh index 6f69e54aacce..a4f23f2167fc 100755 --- a/test/cmd/login.sh +++ b/test/cmd/login.sh @@ -12,9 +12,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete project project-foo + oc delete project project-foo --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/login" # This test validates login functionality for the client diff --git a/test/cmd/migrate.sh b/test/cmd/migrate.sh index 69cf524f49a0..bf946988754a 100755 --- a/test/cmd/migrate.sh +++ b/test/cmd/migrate.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all --all + oc delete all --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/migrate" # This test validates storage migration diff --git a/test/cmd/newapp.sh b/test/cmd/newapp.sh index 9c36f0addbf0..35bf8e3a1a6f 100755 --- a/test/cmd/newapp.sh +++ b/test/cmd/newapp.sh @@ -6,10 +6,10 @@ trap os::test::junit::reconcile_output EXIT ( set +e # oc delete all,templates --all - oc delete-project template-substitute - oc delete-project prefix-template-substitute + oc delete project template-substitute --loglevel=8 + oc delete project prefix-template-substitute --loglevel=8 exit 0 -) &>/dev/null +) os::util::environment::setup_time_vars diff --git a/test/cmd/quota.sh b/test/cmd/quota.sh index 8893169e6f8f..b1220abf8811 100755 --- a/test/cmd/quota.sh +++ b/test/cmd/quota.sh @@ -7,9 +7,9 @@ os::test::junit::declare_suite_start "cmd/quota" # Cleanup cluster resources created by this test suite ( set +e - oc delete project quota-{foo,bar,asmail,images} + oc delete project quota-{foo,bar,asmail,images} --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/quota/clusterquota" diff --git a/test/cmd/registry.sh b/test/cmd/registry.sh index bc9e6229ae19..a18c17c85258 100755 --- a/test/cmd/registry.sh +++ b/test/cmd/registry.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all --all + oc delete all --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/registry/login" diff --git a/test/cmd/router.sh b/test/cmd/router.sh index 45da381a7aed..28254f897c10 100755 --- a/test/cmd/router.sh +++ b/test/cmd/router.sh @@ -6,9 +6,9 @@ trap os::test::junit::reconcile_output EXIT ( set +e oc adm policy remove-scc-from-user privileged -z router - oc delete sa/router -n default + oc delete sa/router -n default --loglevel=8 exit 0 -) &>/dev/null +) defaultimage="openshift/origin-\${component}:latest" USE_IMAGES=${USE_IMAGES:-$defaultimage} diff --git a/test/cmd/routes.sh b/test/cmd/routes.sh index 2f4681c2683f..a421373da017 100755 --- a/test/cmd/routes.sh +++ b/test/cmd/routes.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete route foo bar testroute test-route new-route + oc delete route foo bar testroute test-route new-route --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/routes" diff --git a/test/cmd/sdn.sh b/test/cmd/sdn.sh index 4aa245b4d383..5119f454fd5b 100755 --- a/test/cmd/sdn.sh +++ b/test/cmd/sdn.sh @@ -5,12 +5,12 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete namespace sdn-test-1 - oc delete namespace sdn-test-2 - oc delete namespace sdn-test-3 - oc delete egressnetworkpolicy --all + oc delete namespace sdn-test-1 --loglevel=8 + oc delete namespace sdn-test-2 --loglevel=8 + oc delete namespace sdn-test-3 --loglevel=8 + oc delete egressnetworkpolicy --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/sdn" diff --git a/test/cmd/secrets.sh b/test/cmd/secrets.sh index 79f841ccbdc0..12fd5d10f8e1 100755 --- a/test/cmd/secrets.sh +++ b/test/cmd/secrets.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates,secrets --all + oc delete all,templates,secrets --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/secrets" diff --git a/test/cmd/services.sh b/test/cmd/services.sh index 0aaa0f1904d5..3cfd2ef53db6 100755 --- a/test/cmd/services.sh +++ b/test/cmd/services.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all --loglevel=8 exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/create-service-nodeport" diff --git a/test/cmd/set-image.sh b/test/cmd/set-image.sh index 4317836b3343..302e79f5c5ae 100755 --- a/test/cmd/set-image.sh +++ b/test/cmd/set-image.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/oc/set/image" diff --git a/test/cmd/set-liveness-probe.sh b/test/cmd/set-liveness-probe.sh index c8bb4d8a79d2..29db66177e2b 100755 --- a/test/cmd/set-liveness-probe.sh +++ b/test/cmd/set-liveness-probe.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/set-probe-liveness" diff --git a/test/cmd/setbuildhook.sh b/test/cmd/setbuildhook.sh index 60e1a5ec287d..127d797acaac 100755 --- a/test/cmd/setbuildhook.sh +++ b/test/cmd/setbuildhook.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/builds/setbuildhook" diff --git a/test/cmd/setbuildsecret.sh b/test/cmd/setbuildsecret.sh index f00c99843388..1b7f3cb15c19 100755 --- a/test/cmd/setbuildsecret.sh +++ b/test/cmd/setbuildsecret.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/builds/setbuildsecret" # Validate the set build-secret command diff --git a/test/cmd/status.sh b/test/cmd/status.sh index 7be9d86f1b43..deca01d27bc3 100755 --- a/test/cmd/status.sh +++ b/test/cmd/status.sh @@ -12,9 +12,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete project project-bar + oc delete project project-bar &>/dev/null exit 0 -) &>/dev/null +) login_kubeconfig="${ARTIFACT_DIR}/login.kubeconfig" cp "${KUBECONFIG}" "${login_kubeconfig}" diff --git a/test/cmd/templates.sh b/test/cmd/templates.sh index a79969770450..dba0b5a1c86c 100755 --- a/test/cmd/templates.sh +++ b/test/cmd/templates.sh @@ -5,12 +5,12 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all - oc delete template/ruby-helloworld-sample -n openshift - oc delete project test-template-project - oc delete user someval someval=moreval someval=moreval2 someval=moreval3 + oc delete all,templates --all &>/dev/null + oc delete template/ruby-helloworld-sample -n openshift &>/dev/null + oc delete project test-template-project &>/dev/null + oc delete user someval someval=moreval someval=moreval2 someval=moreval3 &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/templates" diff --git a/test/cmd/timeout.sh b/test/cmd/timeout.sh index b6a72b92e959..5ee252da87b1 100755 --- a/test/cmd/timeout.sh +++ b/test/cmd/timeout.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/request-timeout" diff --git a/test/cmd/triggers.sh b/test/cmd/triggers.sh index 6921a0cc849d..4e0612b3c0d3 100755 --- a/test/cmd/triggers.sh +++ b/test/cmd/triggers.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all --all + oc delete all --all &>/dev/null exit 0 -) &>/dev/null +) url=":${API_PORT:-8443}" diff --git a/test/cmd/volumes.sh b/test/cmd/volumes.sh index e0adb51c505b..70f1cea42092 100755 --- a/test/cmd/volumes.sh +++ b/test/cmd/volumes.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates,pv,pvc --all + oc delete all,templates,pv,pvc --all &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/volumes" diff --git a/test/cmd/whoami.sh b/test/cmd/whoami.sh index f0bdc7c5f6c8..9fc4d9aff149 100755 --- a/test/cmd/whoami.sh +++ b/test/cmd/whoami.sh @@ -5,9 +5,9 @@ trap os::test::junit::reconcile_output EXIT # Cleanup cluster resources created by this test ( set +e - oc delete all,templates --all + oc delete all,templates --all &>/dev/null exit 0 -) &>/dev/null +) os::test::junit::declare_suite_start "cmd/whoami"