openstack/kolla
Code Issues Proposed changes

Switch to RDO proxy mirrors

Browse Source 
We download a large number of packages from trunk.rdoproject.org, the
OpenStack Infra team has setup a per-region caching proxy to speed
up builds and reduce reliance on the internet.

This patch switches builds to use the new mirror and also stops
defining our own mirror variables and rely on the one provided by
nodepool instead.  As part of this patch, we also drop getting the
delorean.repo file from buildlogs.centos.org as it could be out of
sync and essentially broken (until the job to sync runs).  We prefer
going to trunk.rdoproject.org as it will be proxied and cached.

Change-Id: Ia28225de715089bbf5b023d1e134f2fb7da93fbd
This commit is contained in:
Mohammed Naser 2017-04-10 12:11:04 -04:00
parent 77903c70cd
commit 833f3ff117
No known key found for this signature in database
GPG Key ID: 481CBC90384AEC42
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kolla/common/config.py
View File

@ -27,9 +27,8 @@ DISTRO_RELEASE = {
'debian': '8', 'debian': '8',
'ubuntu': '16.04', 'ubuntu': '16.04',
} }
DELOREAN = ("https://buildlogs.centos.org/centos/7/cloud/x86_64/" DELOREAN = \
"rdo-trunk-master-tested/delorean.repo") "https://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo"
# TODO(pbourke): update to buildlogs.centos.org once this moves
DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo" DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo"
INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']

13
tools/setup_gate.sh
View File

@ -7,10 +7,7 @@ set -o errexit
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
source /etc/nodepool/provider source /etc/nodepool/provider
source /etc/ci/mirror_info.sh
NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}
NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
NODEPOOL_PYPI_MIRROR=${NODEPOOL_PYPI_MIRROR:-http://$NODEPOOL_MIRROR_HOST/pypi/simple}
# Just for mandre :) # Just for mandre :)
if [[ ! -f /etc/sudoers.d/jenkins ]]; then if [[ ! -f /etc/sudoers.d/jenkins ]]; then
@ -56,7 +53,9 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://$NODEPOOL_MIRROR_HOST|" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
/etc/yum.repos.d/epel.repo \ /etc/yum.repos.d/epel.repo \
&& sed -i -e "s|^baseurl=http://mirror.centos.org|baseurl=http://$NODEPOOL_MIRROR_HOST|" \ && sed -i -e "s|^baseurl=http://mirror.centos.org|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
/etc/yum.repos.d/CentOS-Ceph-Jewel.repo /etc/yum.repos.d/CentOS-Ceph-Jewel.repo \
&& sed -i -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=$NODEPOOL_RDO_PROXY|" \
/etc/yum.repos.d/delorean.repo
{% elif base_distro == "oracle" %} {% elif base_distro == "oracle" %}
@ -67,7 +66,9 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://$NODEPOOL_MIRROR_HOST|" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
/etc/yum.repos.d/epel.repo \ /etc/yum.repos.d/epel.repo \
&& sed -i -e "s|^baseurl=http://mirror.centos.org|baseurl=http://$NODEPOOL_MIRROR_HOST|" \ && sed -i -e "s|^baseurl=http://mirror.centos.org|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
/etc/yum.repos.d/CentOS-Ceph-Hammer.repo /etc/yum.repos.d/CentOS-Ceph-Hammer.repo \
&& sed -i -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=$NODEPOOL_RDO_PROXY|" \
/etc/yum.repos.d/delorean.repo
{% elif base_distro == "ubuntu" %} {% elif base_distro == "ubuntu" %}