summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-29 10:37:54 +0000
committerGerrit Code Review <review@openstack.org>2019-10-29 10:37:54 +0000
commit912ccf0658e88f5f8cea69c93a4ff1a830149e44 (patch)
treebdbfa569af3d71b6ff1d64f20aaf6bba5d87310a /tests
parente41e86c805167b9ab2f5c6217f8f8ad5cf773f52 (diff)
parentfe00a87ec8e6257ad1724b342b70811c03117b58 (diff)
downloadkolla-912ccf0658e88f5f8cea69c93a4ff1a830149e44.tar.gz
kolla-912ccf0658e88f5f8cea69c93a4ff1a830149e44.zip
Merge "Remove /var/yum/cache from CentOS base image"
Diffstat (limited to 'tests')
-rw-r--r--tests/templates/template_overrides.j26
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 761bf0e83..d907a8dcd 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -48,16 +48,14 @@ RUN sed -i \
{% block base_centos_repo_overrides_post_yum %}
{% endraw %}
-
-RUN sed -i \
+ && sed -i \
-e "/^mirrorlist/ d" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
/etc/yum.repos.d/CentOS-*.repo \
&& sed -i \
-e "/^metalink/ d" \
-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 \
{% raw %}
{% endblock %}