From cdcd5610e95a8188d3e66f93e098838fe91a5a97 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 14 Mar 2019 11:58:52 +0000 Subject: Fix lower-constraints and kolla CI jobs Multiple fixes to fix multiple problems. 1. Bump setuptools requirement to 21.0.0 The 16.0.0 requirement breaks the lower-constraints job on Ubuntu bionic. We see the following error: AttributeError: module 'importlib._bootstrap' has no attribute 'SourceFileLoader' 2. ubuntu-binary horizon image needs to use python3 for django manage.py 3. ubuntu-binary nova-placement-api image needs to use python3 for apache mod wsgi. 4. nova-libvirt needs exact qemu dependencies due to packaging change 5. OracleLinux repos definition was changed in official image. 6. Fetch InfluxDB gpg key for Ubuntu base image from influx server. Change-Id: Ic797d41f53a5f146d112619f1683cbfbf3a85dc2 --- tests/templates/template_overrides.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 7574dbd87..e8aca54e7 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -26,8 +26,8 @@ RUN sed -i -e "/^mirrorlist/d" \ {% elif base_distro == 'oraclelinux' %} {% endraw %} -RUN sed -i -e "s|^baseurl=http://yum.oracle.com/repo/OracleLinux|baseurl={{ nodepool_oraclelinux_proxy }}|" \ - /etc/yum.repos.d/public-yum-ol7.repo +RUN sed -i -e "s|^baseurl=https://yum$ociregion.oracle.com/repo/OracleLinux|baseurl={{ nodepool_oraclelinux_proxy }}|" \ + /etc/yum.repos.d/oracle-linux-ol7.repo {% raw %} {% endif %} -- cgit v1.2.3