diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-12 21:05:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-12 21:05:53 +0000 |
| commit | 285dd5885acc932c5490cce0235ef14a6b44b920 (patch) | |
| tree | e9aa0cbc8dc81610054ac4c2e3aab11391818799 /tools | |
| parent | c8675119c30a115554504bcdea2cb34f5bb61958 (diff) | |
| parent | 833f3ff117ce59a913584e4e926200e1e6ef0b39 (diff) | |
| download | kolla-285dd5885acc932c5490cce0235ef14a6b44b920.tar.gz kolla-285dd5885acc932c5490cce0235ef14a6b44b920.zip | |
Merge "Switch to RDO proxy mirrors"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/setup_gate.sh | 13 |
1 files changed, 7 insertions, 6 deletions
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" %} |