@@ -12,7 +12,7 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -9,7 +9,7 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 platforms=( "${OS_CROSS_COMPILE_PLATFORMS[@]}" )

 if [[ -n "${OS_ONLY_BUILD_PLATFORMS-}" ]]; then

@@ -9,7 +9,7 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # only works on Linux for now, all other platforms must build binaries themselves

 if [[ -z "$@" ]]; then

@@ -15,7 +15,7 @@ STARTTIME=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

 source "${OS_ROOT}/contrib/node/install-sdn.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -12,7 +12,7 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -8,7 +8,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -252,7 +252,7 @@ function os::build::build_static_binaries() {

 }

 readonly -f os::build::build_static_binaries

-# Build binaries targets specified

+# Build binary targets specified

 #

 # Input:

 #   $@ - targets and go flags.  If no targets are set then all binaries targets

@@ -260,8 +260,19 @@ readonly -f os::build::build_static_binaries

 #   OS_BUILD_PLATFORMS - Incoming variable of targets to build for.  If unset

 #     then just the host architecture is built.

 function os::build::build_binaries() {

+  local -a binaries=( "$@" )

   # Create a sub-shell so that we don't pollute the outer environment

-  (

+  ( os::build::internal::build_binaries "${binaries[@]+"${binaries[@]}"}" )  

+}

+

+# Build binary targets specified. Should always be run in a sub-shell so we don't leak GOBIN

+#

+# Input:

+#   $@ - targets and go flags.  If no targets are set then all binaries targets

+#     are built.

+#   OS_BUILD_PLATFORMS - Incoming variable of targets to build for.  If unset

+#     then just the host architecture is built.

+os::build::internal::build_binaries() {

     # Check for `go` binary and set ${GOPATH}.

     os::build::setup_env

@@ -328,7 +339,6 @@ function os::build::build_binaries() {

           "$(dirname ${test})"

       done

     done

-  )

 }

 readonly -f os::build::build_binaries

@@ -7,7 +7,7 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 EXAMPLES=examples

 OUTPUT_PARENT=${OUTPUT_ROOT:-$OS_ROOT}

@@ -9,7 +9,7 @@ set -o pipefail

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

 cd "${OS_ROOT}"

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 pushd "${OS_ROOT}/hack/swagger-doc" > /dev/null

 gradle gendocs --info

@@ -8,7 +8,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 etcd_version=$(go run ${OS_ROOT}/tools/godepversion/godepversion.go ${OS_ROOT}/Godeps/Godeps.json github.com/coreos/etcd/etcdserver)

new file mode 100644

@@ -0,0 +1,100 @@

+#!/bin/bash

+#

+# This library contains an implementation of a stack trace for Bash scripts. 

+

+# os::log::stacktrace::install installs the stacktrace as a handler for the ERR signal if one

+# has not already been installed and sets `set -o errtrace` in order to propagate the handler

+# If the ERR trap is not initialized, installing this plugin will initialize it.

+#

+# Globals:

+#  None

+# Arguments:

+#  None

+# Returns:

+#  - export OS_USE_STACKTRACE

+function os::log::stacktrace::install() {

+    # setting 'errtrace' propagates our ERR handler to functions, expansions and subshells

+    set -o errtrace

+

+    # OS_USE_STACKTRACE is read by os::util::trap at runtime to request a stacktrace

+    export OS_USE_STACKTRACE=true

+

+    os::util::trap::init_err

+}

+readonly -f os::log::stacktrace::install

+

+# os::log::stacktrace::print prints the stacktrace and exits with the return code from the script that

+# called for a stack trace. This function will always return 0 if it is not handling the signal, and if it

+# is handling the signal, this function will always `exit`, not return, the return code it receives as 

+# its first argument.

+#

+# Globals:

+#  - BASH_SOURCE

+#  - BASH_LINENO

+#  - FUNCNAME

+# Arguments:

+#  - 1: the return code of the command in the script that generated the ERR signal

+#  - 2: the last command that ran before handlers were invoked

+#  - 3: whether or not `set -o errexit` was set in the script that generated the ERR signal

+# Returns:

+#  None

+function os::log::stacktrace::print() {

+    local return_code=$1

+    local last_command=$2

+    local errexit_set=${3:-}

+    set --

+

+    # evaulate all of the variables in the last command literal so we have a useful stacktrace

+    # this will *not* be able to capture positional variables ($1, $@, $*) or variables declared

+    # in this scope or in the trap handler ($return_code, $last_command, $errexit_set)

+    # Furthermore, since it is possible that the failure in the last command itself was an unset

+    # variable, we need to turn off that check to ensure we're not re-triggering it here.

+    set +o nounset

+    local -r last_command_with_vars="$( eval "echo \"${last_command}\"" )"

+    set -o nounset

+

+    if [[ "${return_code}" = "0" ]]; then

+        # we're not supposed to respond when no error has occurred

+        return 0

+    fi

+

+    if [[ -z "${errexit_set}" ]]; then

+        # if errexit wasn't set in the shell when the ERR signal was issued, then we can ignore the signal

+        # as this is not cause for failure

+        return 0

+    fi

+

+    # iterate backwards through the stack until we leave library files, so we can be sure we start logging 

+    # actual script code and not this handler's call

+    local stack_begin_index

+    for (( stack_begin_index = 0; stack_begin_index < ${#BASH_SOURCE[@]}; stack_begin_index++ )); do

+        if [[ ! "${BASH_SOURCE[${stack_begin_index}]}" =~ hack/lib/(log/stacktrace|util/trap)\.sh ]]; then

+            break

+        fi

+    done

+

+    local preamble_finished

+    local stack_index=1

+    local i

+    for (( i = stack_begin_index; i < ${#BASH_SOURCE[@]}; i++ )); do

+        local bash_source

+        bash_source="$( os::util::repository_relative_path "${BASH_SOURCE[$i]}" )"

+        if [[ -z "${preamble_finished:-}" ]]; then

+            preamble_finished=true

+            os::log::error "PID ${BASHPID:-$$}: ${bash_source}:${BASH_LINENO[$i-1]}: \`${last_command}\` exited with status ${return_code}." >&2

+            os::log::error "Command with variables substituted is: "

+            os::log::error $'\t'"${last_command_with_vars}"

+            os::log::info $'\t\t'"Stack Trace: "  >&2

+            os::log::info $'\t\t'"  ${stack_index}: ${bash_source}:${BASH_LINENO[$i-1]}: \`${last_command}\`" >&2

+        else

+            os::log::info $'\t\t'"  ${stack_index}: ${bash_source}:${BASH_LINENO[$i-1]}: ${FUNCNAME[$i-1]}" >&2

+        fi

+        stack_index=$(( stack_index + 1 ))

+    done

+

+    # we know we're the privileged handler in this chain, so we can safely exit the shell without

+    # starving another handler of the privilege of reacting to this signal

+    os::log::info "  Exiting with code ${return_code}." >&2

+    exit "${return_code}"

+}

+readonly -f os::log::stacktrace::print

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,96 @@

+#!/bin/bash

+#

+# This library holds miscellaneous utility functions. If there begin to be groups of functions in this

+# file that share intent or are thematically similar, they should be split into their own files.

+

+# os::util::describe_return_code describes an exit code

+#

+# Globals:

+#  - OS_SCRIPT_START_TIME

+# Arguments:

+#  - 1: exit code to describe

+# Returns:

+#  None

+function os::util::describe_return_code() {

+	local return_code=$1

+

+	if [[ "${return_code}" = "0" ]]; then

+		echo -n "[INFO] $0 succeeded "

+	else

+		echo -n "[ERROR] $0 failed "

+	fi

+

+	if [[ -n "${OS_SCRIPT_START_TIME:-}" ]]; then

+		local end_time

+        end_time="$(date +%s)"

+		local elapsed_time

+        elapsed_time="$(( end_time - OS_SCRIPT_START_TIME ))"

+		local formatted_time

+        formatted_time="$( os::util::format_seconds "${elapsed_time}" )"

+		echo "after ${formatted_time}"

+	else

+		echo

+	fi

+}

+readonly -f os::util::describe_return_code

+

+# os::util::install_describe_return_code installs the return code describer for the EXIT trap

+# If the EXIT trap is not initialized, installing this plugin will initialize it.

+#

+# Globals:

+#  None

+# Arguments:

+#  None

+# Returns:

+#  - export OS_DESCRIBE_RETURN_CODE 

+#  - export OS_SCRIPT_START_TIME

+function os::util::install_describe_return_code() {

+	export OS_DESCRIBE_RETURN_CODE="true"

+	OS_SCRIPT_START_TIME="$( date +%s )"; export OS_SCRIPT_START_TIME

+	os::util::trap::init_exit

+}

+readonly -f os::util::install_describe_return_code

+

+# os::util::repository_relative_path returns the relative path from the $OS_ROOT directory to the

+# given file, if the file is inside of the $OS_ROOT directory. If the file is outside of $OS_ROOT,

+# this function will return the absolute path to the file

+#

+# Globals:

+#  - OS_ROOT

+# Arguments:

+#  - 1: the path to relativize

+# Returns:

+#  None

+function os::util::repository_relative_path() {

+	local filename=$1

+

+	if which realpath >/dev/null 2>&1; then

+		local trim_path

+        trim_path="$( realpath "${OS_ROOT}" )/"

+		filename="$( realpath "${filename}" )"

+		filename="${filename##*${trim_path}}"

+	fi

+

+	echo "${filename}"

+}

+readonly -f os::util::repository_relative_path

+

+# os::util::format_seconds formats a duration of time in seconds to print in HHh MMm SSs

+#

+# Globals:

+#  None

+# Arguments:

+#  - 1: time in seconds to format

+# Return:

+#  None

+function os::util::format_seconds() {

+	local raw_seconds=$1

+

+	local hours minutes seconds

+	(( hours=raw_seconds/3600 ))

+	(( minutes=(raw_seconds%3600)/60 ))

+	(( seconds=raw_seconds%60 ))

+

+	printf '%02dh %02dm %02ds' "${hours}" "${minutes}" "${seconds}"

+}

+readonly -f os::util::format_seconds

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,99 @@

+#!/bin/bash

+#

+# This library defines the trap handlers for the ERR and EXIT signals. Any new handler for these signals

+# must be added to these handlers and activated by the environment variable mechanism that the rest use.

+# These functions ensure that no handler can ever alter the exit code that was emitted by a command

+# in a test script.

+

+# os::util::trap::init_err initializes the privileged handler for the ERR signal if it hasn't

+# been registered already. This will overwrite any other handlers registered on the signal.

+#

+# Globals:

+#  None

+# Arguments:

+#  None

+# Returns:

+#  None

+function os::util::trap::init_err() {

+    if ! trap -p ERR | grep -q 'os::util::trap::err_handler'; then

+        trap 'os::util::trap::err_handler;' ERR

+    fi

+}

+readonly -f os::util::trap::init_err

+

+# os::util::trap::init_exit initializes the privileged handler for the EXIT signal if it hasn't

+# been registered already. This will overwrite any other handlers registered on the signal.

+#

+# Globals:

+#  None

+# Arguments:

+#  None

+# Returns:

+#  None

+function os::util::trap::init_exit() {

+    if ! trap -p EXIT | grep -q 'os::util::trap::exit_handler'; then

+        trap 'os::util::trap::exit_handler;' EXIT

+    fi

+}

+readonly -f os::util::trap::init_exit

+

+# os::util::trap::err_handler is the handler for the ERR signal.

+# 

+# Globals:

+#  - OS_TRAP_DEBUG

+#  - OS_USE_STACKTRACE

+# Arguments:

+#  None

+# Returns:

+#  - returns original return code, allows privileged handler to exit if necessary

+function os::util::trap::err_handler() {

+    local -r return_code=$?

+    local -r last_command="${BASH_COMMAND}"

+

+    if set +o | grep -q '\-o errexit'; then

+        local -r errexit_set=true

+    fi

+

+    if [[ "${OS_TRAP_DEBUG:-}" = "true" ]]; then

+        echo "[DEBUG] Error handler executing with return code \`${return_code}\`, last command \`${last_command}\`, and errexit set \`${errexit_set:-}\`" 

+    fi

+

+    if [[ "${OS_USE_STACKTRACE:-}" = "true" ]]; then

+        # the OpenShift stacktrace function is treated as a privileged handler for this signal

+        # and is therefore allowed to run outside of a subshell in order to allow it to `exit`

+        # if necessary

+        os::log::stacktrace::print "${return_code}" "${last_command}" "${errexit_set:-}"

+    fi

+

+    return "${return_code}"

+}

+readonly -f os::util::trap::err_handler

+

+# os::util::trap::exit_handler is the handler for the EXIT signal.

+#

+# Globals:

+#  - OS_TRAP_DEBUG

+#  - OS_DESCRIBE_RETURN_CODE

+# Arguments:

+#  None

+# Returns:

+#  - original exit code of the script that exited

+function os::util::trap::exit_handler() {

+    local -r return_code=$?

+

+    # we do not want these traps to be able to trigger more errors, we can let them fail silently

+    set +o errexit

+

+    if [[ "${OS_TRAP_DEBUG:-}" = "true" ]]; then

+        echo "[DEBUG] Exit handler executing with return code \`${return_code}\`" 

+    fi

+

+    # the following envars selectively enable optional exit traps, all of which are run inside of

+    # a subshell in order to sandbox them and not allow them to influence how this script will exit

+    if [[ "${OS_DESCRIBE_RETURN_CODE:-}" = "true" ]]; then

+        ( os::util::describe_return_code "${return_code}" )

+    fi

+

+    exit "${return_code}"

+}

+readonly -f os::util::trap::exit_handler

\ No newline at end of file

@@ -13,7 +13,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -11,7 +11,7 @@ STARTTIME=$(date +%s)

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

 cd "${OS_ROOT}"

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 os::util::environment::setup_time_vars

 function cleanup()

@@ -20,7 +20,7 @@ if [[ "${TEST_END_TO_END:-}" != "direct" ]]; then

 fi

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 ensure_iptables_or_die

@@ -44,7 +44,7 @@ start_time=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

 cd "${OS_ROOT}"

-os::log::install_errexit

+os::log::stacktrace::install

 os::build::setup_env

 os::util::environment::setup_tmpdir_vars "test-go"

@@ -7,7 +7,7 @@ set -o pipefail

 STARTTIME=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Go to the top of the tree.

 cd "${OS_ROOT}"

@@ -26,7 +26,7 @@ trap exit_trap EXIT

 start_time=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 os::util::environment::setup_tmpdir_vars "test-lib"

 cd "${OS_ROOT}"

@@ -26,7 +26,7 @@ trap exit_trap EXIT

 start_time=$(date +%s)

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # envars used to track these interactions are not propagated out of the subshells used to run these commands

 # therefore each os::cmd call is its own sandbox and complicated scenarios need to play out inside one call

@@ -10,7 +10,7 @@ STARTTIME=$(date +%s)

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

 cd "${OS_ROOT}"

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 os::test::junit::declare_suite_start 'tools'

@@ -8,7 +8,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 BASETMPDIR="${TMPDIR:-/tmp}/openshift/test-tools"

@@ -15,7 +15,7 @@ set -o pipefail

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

 cd "${OS_ROOT}"

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # read in envar options

 verify="${VERIFY:-}"

@@ -8,7 +8,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 function cleanup()

 {

@@ -722,79 +722,6 @@ readonly -f disable-selinux

 # end of common functions for extended test group's run.sh scripts

 ######

-# Handler for when we exit automatically on an error.

-# Borrowed from https://gist.github.com/ahendrix/7030300

-function os::log::errexit() {

-	local err="${PIPESTATUS[@]}"

-

-	# If the shell we are in doesn't have errexit set (common in subshells) then

-	# don't dump stacks.

-	set +o | grep -qe "-o errexit" || return

-

-	set +o xtrace

-	local code="${1:-1}"

-	os::log::error_exit "'${BASH_COMMAND}' exited with status $err" "${1:-1}" 1

-}

-readonly -f os::log::errexit

-

-function os::log::install_errexit() {

-	# trap ERR to provide an error handler whenever a command exits nonzero this

-	# is a more verbose version of set -o errexit

-	trap 'os::log::errexit' ERR

-

-	# setting errtrace allows our ERR trap handler to be propagated to functions,

-	# expansions and subshells

-	set -o errtrace

-}

-readonly -f os::log::install_errexit

-

-# Print out the stack trace

-#

-# Args:

-#	 $1 The number of stack frames to skip when printing.

-function os::log::stack() {

-	local stack_skip=${1:-0}

-	stack_skip=$((stack_skip + 1))

-	if [[ ${#FUNCNAME[@]} -gt $stack_skip ]]; then

-	echo "Call stack:" >&2

-	local i

-	for ((i=1 ; i <= ${#FUNCNAME[@]} - $stack_skip ; i++))

-	do

-		local frame_no=$((i - 1 + stack_skip))

-		local source_file=${BASH_SOURCE[$frame_no]}

-		local source_lineno=${BASH_LINENO[$((frame_no - 1))]}

-		local funcname=${FUNCNAME[$frame_no]}

-		echo "	$i: ${source_file}:${source_lineno} ${funcname}(...)" >&2

-	done

-	fi

-}

-readonly -f os::log::stack

-

-# Log an error and exit.

-# Args:

-#	 $1 Message to log with the error

-#	 $2 The error code to return

-#	 $3 The number of stack frames to skip when printing.

-function os::log::error_exit() {

-	local message="${1:-}"

-	local code="${2:-1}"

-	local stack_skip="${3:-0}"

-	stack_skip=$((stack_skip + 1))

-

-	local source_file=${BASH_SOURCE[$stack_skip]}

-	local source_line=${BASH_LINENO[$((stack_skip - 1))]}

-	echo "!!! Error in ${source_file}:${source_line}" >&2

-	[[ -z ${1-} ]] || {

-	echo "	${1}" >&2

-	}

-

-	os::log::stack $stack_skip

-

-	echo "Exiting with status ${code}" >&2

-	exit "${code}"

-}

-readonly -f os::log::error_exit

-

 function os::log::with-severity() {

   local msg=$1

   local severity=$2

@@ -9,7 +9,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Open port scanning

 echo "[INFO] Checking open ports ('sudo openshift start' should already be running)"

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 os::test::junit::declare_suite_start "cmd/authentication"

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # This test validates the diagnostics command

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 os::test::junit::declare_suite_start "cmd/help"

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 os::test::junit::declare_suite_start "cmd/policy"

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 # Cleanup cluster resources created by this test

 (

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -6,7 +6,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 trap os::test::junit::reconcile_output EXIT

 # Cleanup cluster resources created by this test

@@ -9,7 +9,7 @@ set -o pipefail

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

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 os::util::environment::setup_time_vars

 trap os::test::junit::reconcile_output EXIT

@@ -9,7 +9,7 @@ set -o pipefail

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

 cd "${OS_ROOT}"

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 os::util::environment::setup_all_server_vars "test-extended-alternate-certs/"

 reset_tmp_dir

@@ -11,7 +11,7 @@ set -o pipefail

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

 cd "${OS_ROOT}"

 source "${OS_ROOT}/hack/lib/init.sh"

-os::log::install_errexit

+os::log::stacktrace::install

 os::util::environment::setup_all_server_vars "test-extended-alternate-launches/"

 reset_tmp_dir