Skip to content

Commit ea82410

Browse files
committed
fix failure when running on private clusters
1 parent 3867c63 commit ea82410

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

ci-operator/step-registry/openshift-logging/catalogsources/openshift-logging-catalogsources-commands.sh

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ set -e
44
set -u
55
set -o pipefail
66

7+
if test -s "${SHARED_DIR}/proxy-conf.sh" ; then
8+
echo "setting the proxy"
9+
echo "source ${SHARED_DIR}/proxy-conf.sh"
10+
source "${SHARED_DIR}/proxy-conf.sh"
11+
else
12+
echo "no proxy setting."
13+
fi
14+
715
test_version="${LOGGING_TEST_VERSION}"
816

917
if [[ -z ${test_version} ]] ; then
@@ -17,16 +25,6 @@ if [[ -z "${ocp_version}" ]]; then
1725
exit 1
1826
fi
1927

20-
function set_proxy () {
21-
if test -s "${SHARED_DIR}/proxy-conf.sh" ; then
22-
echo "setting the proxy"
23-
echo "source ${SHARED_DIR}/proxy-conf.sh"
24-
source "${SHARED_DIR}/proxy-conf.sh"
25-
else
26-
echo "no proxy setting."
27-
fi
28-
}
29-
3028
function run_command() {
3129
local CMD="$1"
3230
echo "Running Command: ${CMD}"
@@ -272,7 +270,6 @@ function check_olm_capability() {
272270
return 0 # Return 0 for success
273271
}
274272

275-
set_proxy
276273
# Check for required commands
277274
command -v jq >/dev/null 2>&1 || { echo >&2 "Error: jq is not installed. Aborting."; exit 1; }
278275
command -v yq-go >/dev/null 2>&1 || { echo >&2 "Error: yq-go is not installed. Aborting."; exit 1; }

0 commit comments

Comments
 (0)