Browse Source

Fix multiple CI issues

1. Pin openstacksdk and client libraries in kolla-toolbox

Stein and below only.

openstacksdk released 0.45.0 (and possibly 0.44.0 as well) which dropped
py2 compat but did not advertise the fact. It was amended later but it
will now always affect kolla images until pinned to older.

The observable error is:
"ImportError: No module named queue"

Since Train we pin u-c, but not before that.

This change introduces a version constraint for openstacksdk and client
libs:

- python-novaclient
- python-cinderclient
- python-keystoneclient
- python-glanceclient

2. Make deploy jobs non-voting

For similar reasons to 1., the deploy jobs fail when using the openstack
client for testing. Due to a dependency loop between these two projects,
we must make these jobs non-voting to fix the image build. This should
be reverted ASAP.

3. CI: Add https match for mirror.centos.org to template-overrides

Some CentOS repos (currently one - Ceph NFS Ganesha) use
https://mirror.centos.org instead of http:// and we break
their definition by removing mirrorlist= entry and not inserting baseurl
entry due to a missing match.

Original Change-Id: I7b29f8c6be80820042023d2b85162d5cc9a65f08

Change-Id: I8c2da6437333210a7926f2deb926ab5d1c93c3c6
Closes-Bug: #1870349
(cherry picked from commit 4d11cd647a)
changes/24/717024/8
Mark Goddard 3 months ago
committed by Radosław Piliszek
parent
commit
7f4baeafdd
5 changed files with 24 additions and 0 deletions
  1. +4
    -0
      .zuul.d/centos.yaml
  2. +4
    -0
      .zuul.d/oraclelinux.yaml
  3. +4
    -0
      .zuul.d/ubuntu.yaml
  4. +5
    -0
      docker/kolla-toolbox/Dockerfile.j2
  5. +7
    -0
      tests/templates/template_overrides.j2

+ 4
- 0
.zuul.d/centos.yaml View File

@@ -8,10 +8,14 @@
required-projects:
- openstack/kolla-ansible
- openstack/requirements
# FIXME(mgoddard): Revert this when kolla-ansible CI passes.
voting: false
- kolla-ansible-centos-binary:
required-projects:
- openstack/kolla-ansible
- openstack/requirements
# FIXME(mgoddard): Revert this when kolla-ansible CI passes.
voting: false
- kolla-ansible-bifrost-centos-source:
files: ^docker\/bifrost\/.*
- kolla-ansible-centos-source-ceph:


+ 4
- 0
.zuul.d/oraclelinux.yaml View File

@@ -8,10 +8,14 @@
required-projects:
- openstack/kolla-ansible
- openstack/requirements
# FIXME(mgoddard): Revert this when kolla-ansible CI passes.
voting: false
- kolla-ansible-oraclelinux-binary:
required-projects:
- openstack/kolla-ansible
- openstack/requirements
# FIXME(mgoddard): Revert this when kolla-ansible CI passes.
voting: false
- kolla-ansible-oraclelinux-source-ceph:
files: ^docker\/(ceph|cinder)\/.*
gate:


+ 4
- 0
.zuul.d/ubuntu.yaml View File

@@ -15,10 +15,14 @@
required-projects:
- openstack/kolla-ansible
- openstack/requirements
# FIXME(mgoddard): Revert this when kolla-ansible CI passes.
voting: false
- kolla-ansible-ubuntu-binary:
required-projects:
- openstack/kolla-ansible
- openstack/requirements
# FIXME(mgoddard): Revert this when kolla-ansible CI passes.
voting: false
- kolla-ansible-ubuntu-source-ceph:
files: ^docker\/(ceph|cinder)\/.*
gate:


+ 5
- 0
docker/kolla-toolbox/Dockerfile.j2 View File

@@ -82,9 +82,14 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
'"cmd2<0.9.0"',
'influxdb',
'MySQL-python',
'"openstacksdk<0.18.0"',
'os-client-config==1.29.0',
'pbr==4.0.0',
'pymongo',
'"python-cinderclient<4.2.0"',
'"python-glanceclient<2.14.0"',
'"python-keystoneclient<3.18.0"',
'"python-novaclient<11.1.0"',
'python-openstackclient==3.14.0',
'pytz',
'pyudev',


+ 7
- 0
tests/templates/template_overrides.j2 View File

@@ -20,6 +20,9 @@ RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow-

RUN sed -i -e "/^mirrorlist/d" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
-e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
-e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
-e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
/etc/yum.repos.d/CentOS-Base.repo

{% raw %}
@@ -41,7 +44,9 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "/^metalink/d" \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \
-e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \
-e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \
@@ -54,8 +59,10 @@ RUN sed -i -e "/^mirrorlist/d" \
RUN sed -i -e "/^mirrorlist/d" \
-e "/^metalink/d" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \
-e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \
-e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \


Loading…
Cancel
Save