diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-01-24 10:17:17 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-01-26 15:06:18 +0100 |
| commit | b22f8f63a33b5a7c0ee43fc8ee346d636bb2a896 (patch) | |
| tree | 5da33b2a010cd590fcc78ed89d2a78ba46a095fe /docker/openstack-base/Dockerfile.j2 | |
| parent | c9cfe6e99a09d26ca6a202b329e0e28e8b817ee8 (diff) | |
| download | kolla-b22f8f63a33b5a7c0ee43fc8ee346d636bb2a896.tar.gz kolla-b22f8f63a33b5a7c0ee43fc8ee346d636bb2a896.zip | |
CI: make it work again
Python changes:
- limit pip to 20.x as this is last version working on both Python 2 and 3.
- cap 'setuptools' to be older than 58 to have use_2to3 functionality
(fixes 'anyjson' installation)
- upgrade pip in 'elasticsearch-curator' image to get it built on CentOS 7
Unbuildable images:
- 'bifrost-base' under CentOS 8
(Error: Cannot find a valid baseurl for repo: epel)
- 'monasca-grafana' under CentOS 7/8
- 'sensu-client' under CentOS 7
(aws-eventstream requires Ruby version >= 2.3)
- dropped *-upgrade CI jobs as Stein is EOL
- pin 'qpid-proton-c' package for CentOS 7 to not install EPEL one
(cinder-volume, openstack-base and tripleoclient)
- bump 'libvirt-python' in 'masakari-monitors' to 7.10.0
(newer branches install package from distribution but CentOS 7 lacks
it)
- pin 'unf_ext' gem in Sensu images as CentOS 7 lacks Ruby 2.2+
(fixed sensu-server)
- install 'ca-certificates' for newer Let's Encrypt certificates support
(so we can fetch upper-constraints)
- make Zuul fetch openstack/requirements project files
(make 'openstack-base' pass) (like 2nd fix)
Co-Authored-by: Pierre Riteau <pierre@stackhpc.com>
Closes-Bug: #1943617
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/826464
Change-Id: I8ee32e53cda581493b2a4bb73ca72ab05014b9d4
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9ff44b86f..408a2af63 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -96,6 +96,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-zaqarclient', ] %} {% else %} + {# NOTE(hrw): qpid-proton-c 0.26 from centos-openstack-train repo instead of epel #} {% set openstack_base_packages = openstack_base_packages + [ 'python2-cryptography', 'python2-eventlet', @@ -173,6 +174,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python2-webob', 'python-zaqarclient', 'PyYAML', + 'qpid-proton-c-0.26.*', 'sysvinit-tools' ] %} {% endif %} @@ -410,7 +412,9 @@ RUN ln -s openstack-base-source/* /requirements \ ENV PATH /var/lib/kolla/venv/bin:$PATH -RUN {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} +{# NOTE(hrw): setuptools is capped in openstack/requirements as this version still has use_2to3 #} +RUN {{ macros.install_pip(["'setuptools < 58'"]) }} \ + && {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} {% endif %} |
