aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-05-11 15:29:37 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-05-17 17:38:10 +0200
commit09604a7492752c1e4afa9c0facfb4309e9862616 (patch)
treef5479b9f559408d8e40d1e6da9cc5d4d501852f8 /tests
parentaabd532da9fe3cac64626d481c4b3113b5925e69 (diff)
downloadkolla-09604a7492752c1e4afa9c0facfb4309e9862616.tar.gz
kolla-09604a7492752c1e4afa9c0facfb4309e9862616.zip
base/centos: take care of whitespaces
Let's get rid of this warning: Change-Id: I121e2ecb30ec6e8d1b6d88d9b921894438c3e094 INFO:kolla.common.utils.base:ESC[91m[WARNING]: Empty continuation line found in: INFO:kolla.common.utils.base: RUN dnf -y install centos-release-opstools epel-release dnf-plugins-core && dnf config-manager --enable PowerTools && dnf config-manager --disable centos-ceph-nautilus && dnf config-manager --disable centos-nfs-ganesha28 && dnf config-manager --disable influxdb && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools && dnf -y distro-sync --security --sec-severity=Important --sec-severity=Critical INFO:kolla.common.utils.base:[WARNING]: Empty continuation lines will become errors in a future release. INFO:kolla.common.utils.base:ESC[0m INFO:kolla.common.utils.base:Step 1/39 : FROM centos:8
Diffstat (limited to 'tests')
-rw-r--r--tests/templates/template_overrides.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index d3726bb5d..48941f676 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -41,8 +41,8 @@ RUN sed -i \
{% raw %}
{% endblock %}
-{% block base_centos_repo_overrides_post_yum %}
-{% endraw %}
+{% block base_centos_repo_overrides_post_yum -%}
+{%- endraw -%}
&& sed -i \
-e "/^mirrorlist/ d" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
@@ -55,7 +55,7 @@ RUN sed -i \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
-e "s|^#baseurl=https://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
/etc/yum.repos.d/epel*.repo \
-{% raw %}
+{%- raw -%}
{% endblock %}
{% block base_debian_after_sources_list %}