Skip to content

fix failure when running on private clusters #76510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QiaolingTang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix failure when running on private clusters #76510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions ...ep-registry/openshift-logging/catalogsources/openshift-logging-catalogsources-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ set -e
set -u
set -o pipefail

if test -s "${SHARED_DIR}/proxy-conf.sh" ; then
echo "setting the proxy"
echo "source ${SHARED_DIR}/proxy-conf.sh"
source "${SHARED_DIR}/proxy-conf.sh"
else
echo "no proxy setting."
fi

test_version="${LOGGING_TEST_VERSION}"

if [[ -z ${test_version} ]] ; then
Expand All @@ -17,16 +25,6 @@ if [[ -z "${ocp_version}" ]]; then
exit 1
fi

function set_proxy () {
if test -s "${SHARED_DIR}/proxy-conf.sh" ; then
echo "setting the proxy"
echo "source ${SHARED_DIR}/proxy-conf.sh"
source "${SHARED_DIR}/proxy-conf.sh"
else
echo "no proxy setting."
fi
}

function run_command() {
local CMD="$1"
echo "Running Command: ${CMD}"
Expand Down Expand Up @@ -272,7 +270,6 @@ function check_olm_capability() {
return 0 # Return 0 for success
}

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