From ec9ebaa3e0db53841ab7ec70916599a85e338edd Mon Sep 17 00:00:00 2001 From: Michael Beaver Date: Fri, 31 Jul 2020 16:08:57 -0500 Subject: [PATCH] Fix HTTP_PROXY variable not being set In 21_systemwide_executable.sh and 22_test_configs.sh the HTTP_PROXY variable is not being set while the HTTPS_PROXY variable is being set twice. Closes: #318 Change-Id: I84de84b79b76cef3967248f730f022f1b8f34987 --- tools/deployment/21_systemwide_executable.sh | 2 +- tools/deployment/22_test_configs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/deployment/21_systemwide_executable.sh b/tools/deployment/21_systemwide_executable.sh index 48583cad1..be1305b76 100755 --- a/tools/deployment/21_systemwide_executable.sh +++ b/tools/deployment/21_systemwide_executable.sh @@ -16,7 +16,7 @@ set -xe export USE_PROXY=${USE_PROXY:-"false"} export HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy}} -export HTTPS_PROXY=${HTTP_PROXY:-${http_proxy}} +export HTTP_PROXY=${HTTP_PROXY:-${http_proxy}} export NO_PROXY=${NO_PROXY:-${no_proxy}} echo "Build airshipctl in docker image" diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index b86510c48..04836b84e 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -20,7 +20,7 @@ export AIRSHIPCTL_WS=${AIRSHIPCTL_WS:-$PWD} export USER_NAME=${USER:-"ubuntu"} export USE_PROXY=${USE_PROXY:-"false"} export HTTPS_PROXY=${HTTPS_PROXY:-${https_proxy}} -export HTTPS_PROXY=${HTTP_PROXY:-${http_proxy}} +export HTTP_PROXY=${HTTP_PROXY:-${http_proxy}} export NO_PROXY=${NO_PROXY:-${no_proxy}} export AIRSHIP_CONFIG_ISO_GEN_TARGET_PATH=${ISO_DIR} export AIRSHIP_CONFIG_ISO_BUILDER_DOCKER_IMAGE=${BUILDER_IMAGE:-"quay.io/airshipit/isogen:latest-debian_stable"}