diff options
| author | Mohammed Naser <mnaser@vexxhost.com> | 2017-04-10 12:11:04 -0400 |
|---|---|---|
| committer | Mohammed Naser <mnaser@vexxhost.com> | 2017-04-10 14:27:01 -0400 |
| commit | 833f3ff117ce59a913584e4e926200e1e6ef0b39 (patch) | |
| tree | bbbc753caa821ff19c264aea61c265126acbabb8 | |
| parent | 77903c70cd651ad97a6a918f6889e5120d85b8d1 (diff) | |
| download | kolla-833f3ff117ce59a913584e4e926200e1e6ef0b39.tar.gz kolla-833f3ff117ce59a913584e4e926200e1e6ef0b39.zip | |
Switch to RDO proxy mirrors
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
| -rwxr-xr-x | kolla/common/config.py | 5 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 2c8eb8e00..3bcbc2b19 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -27,9 +27,8 @@ DISTRO_RELEASE = { 'debian': '8', 'ubuntu': '16.04', } -DELOREAN = ("https://buildlogs.centos.org/centos/7/cloud/x86_64/" - "rdo-trunk-master-tested/delorean.repo") -# TODO(pbourke): update to buildlogs.centos.org once this moves +DELOREAN = \ + "https://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo" DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo" INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 0d07b7ea1..6939f257a 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -7,10 +7,7 @@ set -o errexit export PYTHONUNBUFFERED=1 source /etc/nodepool/provider - -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} +source /etc/ci/mirror_info.sh # Just for mandre :) 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|" \ /etc/yum.repos.d/epel.repo \ && 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" %} @@ -67,7 +66,9 @@ RUN sed -i -e "/^mirrorlist/d" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://$NODEPOOL_MIRROR_HOST|" \ /etc/yum.repos.d/epel.repo \ && 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" %} |