Merge "Revert "Use the infra pypi mirror for DIB"" into stable/stein

This commit is contained in:
Zuul 2019-09-07 03:17:25 +00:00 committed by Gerrit Code Review
commit 0fda817667
2 changed files with 14 additions and 26 deletions

View File

@ -89,21 +89,6 @@ function build_octavia_worker_image {
export PARAM_OCTAVIA_AMP_IMAGE_SIZE='-s '$OCTAVIA_AMP_IMAGE_SIZE
fi
# Use the infra pypi mirror if it is available
if [[ -e /etc/ci/mirror_info.sh ]]; then
source /etc/ci/mirror_info.sh
fi
if [[ ${NODEPOOL_PYPI_MIRROR:+1} ]]; then
if [[ ${DIB_LOCAL_ELEMENTS:+1} ]]; then
export DIB_LOCAL_ELEMENTS="${DIB_LOCAL_ELEMENTS} pypi"
else
export DIB_LOCAL_ELEMENTS='pypi'
fi
export DIB_PYPI_MIRROR_URL=$NODEPOOL_PYPI_MIRROR
export DIB_PYPI_MIRROR_URL_1=$NODEPOOL_WHEEL_MIRROR
export DIB_PIP_RETRIES=0
fi
if ! [ -f $OCTAVIA_AMP_IMAGE_FILE ]; then
local dib_logs=/var/log/dib-build
if [[ -e ${dib_logs} ]]; then

View File

@ -66,6 +66,8 @@
- ^tools/.*$
- ^(test-|)requirements.txt$
- ^tox.ini$
# Temporary to get the gates fixed with a patch revert
voting: false
- octavia-v2-dsvm-tls-barbican:
irrelevant-files:
- ^.*\.rst$
@ -107,17 +109,18 @@
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-py2-scenario
- octavia-v2-dsvm-scenario-ubuntu-xenial
- octavia-grenade:
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^doc/.*$
- ^octavia/tests/unit/.*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tools/.*$
- ^(test-|)requirements.txt$
- ^tox.ini$
# Temporary to get the gates fixed with a patch revert
# - octavia-grenade:
# irrelevant-files:
# - ^.*\.rst$
# - ^api-ref/.*$
# - ^doc/.*$
# - ^octavia/tests/unit/.*$
# - ^releasenotes/.*$
# - ^setup.cfg$
# - ^tools/.*$
# - ^(test-|)requirements.txt$
# - ^tox.ini$
periodic:
jobs:
- publish-openstack-octavia-amphora-image-xenial: