diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-03-05 14:34:18 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-03-05 17:54:44 +0000 |
| commit | a755304795eb7bd43a26b7380aa2686151295c64 (patch) | |
| tree | 949334cd7688f9764f0aaba324e2e7d2aea0919e /kolla | |
| parent | e58653c436af6c3cc9f0dfd6019c43be8e5844da (diff) | |
| download | kolla-a755304795eb7bd43a26b7380aa2686151295c64.tar.gz kolla-a755304795eb7bd43a26b7380aa2686151295c64.zip | |
Multiple fixes to unblock CI
This change includes a number of fixes to make CI functional.
* Blacklist ansible 2.8.9 in kolla-toolbox
Ansible 2.8.9 broke the OpenStack modules, see
https://bugs.launchpad.net/kolla/+bug/1866181 for details.
This causes us to fail with the following error:
/usr/lib64/python2.7/distutils/version.py\", line 40, in __init__
self.parse(vstring)
File "/usr/lib64/python2.7/distutils/version.py", line 105, in parse
match = self.version_re.match(vstring)\nTypeError: expected string or buffer
This change works around the issue by blacklisting ansible 2.8.9 in
the kolla-toolbox image.
* Drop CentOS 7 CI jobs. There are multiple issues with CentOS 7 now,
and we have CentOS 8 jobs in place so it's time to move on
* pin requirements to commit
ea42244642c3c091cb4f70917ae8d79af217b6af. This is required to avoid
oslo.cache 2.1.0, which breaks us. See
https://bugs.launchpad.net/kolla-ansible/+bug/1866008.
Change-Id: Iebc39bd804d2c4f553d42c285549f50f4c8bc8be
Closes-Bug: #1866181
Related-Bug: #1866008
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 12920586e..88951d9c0 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -292,10 +292,14 @@ _BASE_OPTS = [ SOURCES = { + # FIXME(mgoddard): Pinning requirements to + # ea42244642c3c091cb4f70917ae8d79af217b6af. This is required to avoid + # oslo.cache 2.1.0, which breaks us. See + # https://bugs.launchpad.net/kolla-ansible/+bug/1866008. 'openstack-base': { - 'type': 'url', - 'location': ('$tarballs_base/requirements/' - 'requirements-${openstack_branch}.tar.gz')}, + 'type': 'git', + 'location': 'https://opendev.org/openstack/requirements', + 'reference': 'ea42244642c3c091cb4f70917ae8d79af217b6af'}, 'aodh-base': { 'type': 'url', 'location': ('$tarballs_base/aodh/' |