Skip to content

Commit e369fd2

Browse files
committed
Drop set -x for hack and test scripts
1 parent 1f22fa8 commit e369fd2

13 files changed

+3
-38
lines changed

hack/build-images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
set -euxo pipefail
3+
set -euo pipefail
44

55
tmpworkdir=${WORKDIR:-$( mktemp --tmpdir -d logging-build-XXXXXXXXXX )}
66
function cleanup() {

hack/deploy-logging.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,10 @@
3131
# CLO_IMAGE and EO_IMAGE.
3232

3333
set -euo pipefail
34-
if [ "${DEBUG:-}" = "true" ]; then
35-
set -x
36-
fi
3734

3835
logging_err_exit() {
3936
set +e
4037
{
41-
set -x
4238
for ns in $LOGGING_NS $ESO_NS ; do
4339
oc -n $ns get subscription
4440
oc -n $ns get clusterserviceversion

hack/enable-kibana-msearch-access.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
set -euo pipefail
4343

4444
if [ -n "${DEBUG:-}" ] ; then
45-
set -x
4645
curl_output() {
4746
python -mjson.tool
4847
}

hack/get-machine-run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ ANSIBLE_LOG_PATH=/tmp/ansible-origin.log ansible-playbook -vvv --become
639639
\${playbook}
640640
EOF
641641
scp $runfile openshiftdevel:/tmp
642-
ssh -n openshiftdevel "bash -x $runfile"
642+
ssh -n openshiftdevel "bash $runfile"
643643

644644
# title: "expose the kubeconfig"
645645
cat > $runfile <<EOF

hack/logging-dump.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ then
2222
fi
2323

2424
set -euo pipefail
25-
if [ -n "${DEBUG:-}" ] ; then
26-
set -x
27-
fi
2825

2926
declare -a components=()
3027

hack/testing/test-010-smoke-test-logging.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
# are deployable using the latest operators.
44

55
set -euo pipefail
6-
if [ "${DEBUG:-}" = "true" ]; then
7-
set -x
8-
fi
6+
97
current_dir=$(dirname "${BASH_SOURCE[0]}" )
108
repo_dir=${repodir:-"$current_dir/../.."}
119
source ${current_dir}/common

hack/vendor-kibana-lib.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
# This script updates the vendored libraries
44
# added to Kibana
55

6-
if [[ -n ${DEBUG:-""} ]] ; then
7-
set -x
8-
fi
9-
106
set -o errexit
117
set -o nounset
128
set -o pipefail

hack/vendor/olm-test-script/e2e-olm.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
set -euo pipefail
44

5-
if [ "${DEBUG:-}" = "true" ]; then
6-
set -x
7-
fi
8-
95
TEST_NAMESPACE=${TEST_NAMESPACE:-olm-test}
106
TARGET_NAMESPACE=${TARGET_NAMESPACE:-olm-test}
117
CREATE_OPERATORGROUP=${CREATE_OPERATORGROUP:-"true"}

test/0540-bz1710868-fix-access-to-root-endpoint

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ os::util::environment::use_sudo
1111
test_name=$(basename $0)
1212
os::test::junit::declare_suite_start ${test_name}
1313

14-
if [ -n "${DEBUG:-}" ] ; then
15-
set -x
16-
fi
17-
1814
cleanup() {
1915
local return_code="$?"
2016
set +e

test/json-parsing.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ os::util::environment::use_sudo
1010

1111
os::test::junit::declare_suite_start "test/json-parsing"
1212

13-
if [ -n "${DEBUG:-}" ] ; then
14-
set -x
15-
fi
16-
1713
cleanup() {
1814
local return_code="$?"
1915
set +e

test/kibana_dashboards.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ os::util::environment::use_sudo
99
os::test::junit::declare_suite_start "test/kibana_dashboards"
1010

1111
if [ -n "${DEBUG:-}" ] ; then
12-
set -x
1312
curl_output() {
1413
python -mjson.tool
1514
}

test/utf8-characters.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ os::util::environment::use_sudo
1010

1111
os::test::junit::declare_suite_start "test/utf8-characters"
1212

13-
if [ -n "${DEBUG:-}" ] ; then
14-
set -x
15-
fi
16-
1713
cleanup() {
1814
local return_code="$?"
1915
set +e

test/viaq-data-model.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ FLUENTD_WAIT_TIME=${FLUENTD_WAIT_TIME:-$(( 2 * minute ))}
1313

1414
os::test::junit::declare_suite_start "test/viaq-data-model"
1515

16-
if [ -n "${DEBUG:-}" ] ; then
17-
set -x
18-
fi
19-
2016
cleanup() {
2117
local return_code="$?"
2218
set +e

0 commit comments

Comments
 (0)