Skip to content

Commit 2ebce8f

Browse files
author
Dmitriy Rabotyagov
committed
Remove load_nodepool_pip_opts function
During bootstrap process we tried to use infra mirrors and wheels for PyPi, however they are not being built anymore for modern distros. So we can simplify code and remove the function as a whole. Change-Id: I7b40a2e9500dc092e3ecb6847629037c614d5a1f Signed-off-by: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
1 parent 2cc78a2 commit 2ebce8f

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

scripts/bootstrap-ansible.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@ case ${DISTRO_ID} in
117117
;;
118118
esac
119119

120-
# Load nodepool PIP mirror settings
121-
load_nodepool_pip_opts
122-
123120
# Ensure we use the HTTPS/HTTP proxy with pip if it is specified
124121
if [ -n "$HTTPS_PROXY" ]; then
125122
PIP_OPTS+=" --proxy $HTTPS_PROXY"

scripts/gate-check-commit.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ log_instance_info
9393

9494
run_dstat || true
9595

96-
load_nodepool_pip_opts
97-
9896
# Bootstrap Ansible
9997
if [[ -z "${SKIP_OSA_BOOTSTRAP_AIO+defined}" ]]; then
10098
source "${OSA_CLONE_DIR}/scripts/bootstrap-ansible.sh"
@@ -129,7 +127,7 @@ elif [[ "${ACTION}" == "shastest" ]]; then
129127
elif [[ "${ACTION}" == "linters" ]]; then
130128
pushd "${OSA_CLONE_DIR}"
131129
# Install linter tools
132-
${PIP_COMMAND} install --isolated ${PIP_OPTS} -r ${OSA_CLONE_DIR}/test-requirements.txt
130+
${PIP_COMMAND} install --isolated -r ${OSA_CLONE_DIR}/test-requirements.txt
133131
# Disable Ansible color output
134132
export ANSIBLE_NOCOLOR=1
135133
# Create ansible logging directory
@@ -249,8 +247,6 @@ if [[ "${ACTION}" =~ "upgrade" ]]; then
249247
unset PIP_OPTS
250248
unset UPGRADE_TARGET_BRANCH
251249

252-
load_nodepool_pip_opts
253-
254250
# Source the current scripts-library.sh functions
255251
source "${OSA_CLONE_DIR}/scripts/scripts-library.sh"
256252
# We need this as in stein we were deploying custom

scripts/scripts-library.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,6 @@ function build_ansible_runtime_venv {
8888
fi
8989
}
9090

91-
# If in OpenStack-Infra, set some vars to use the mirror when bootstrapping Ansible
92-
function load_nodepool_pip_opts {
93-
if [[ -e /etc/ci/mirror_info.sh ]]; then
94-
source /etc/ci/mirror_info.sh
95-
export PIP_OPTS="--index-url ${NODEPOOL_PYPI_MIRROR} --trusted-host ${NODEPOOL_MIRROR_HOST} --extra-index-url ${NODEPOOL_WHEEL_MIRROR}"
96-
else
97-
export PIP_OPTS=${PIP_OPTS:-""}
98-
fi
99-
}
100-
10191
# Determine the distribution we are running on, so that we can configure it
10292
# appropriately.
10393
function determine_distro {

0 commit comments

Comments
 (0)