add debugging to test-cmd

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}"

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 )"
 

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"

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"
 

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' <<< "$*"

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}"

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

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

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"

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

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"

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"

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"

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"

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"

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"

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"

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'

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 )"
 

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 )"
 

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

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

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
 

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"
 

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"

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}

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"

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"
 

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"

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"

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"