Fix zuul jobs

Some clients dropped support for py37, run the tips job with py38
instead.

Drop lower-constraints jobs and use the latest version of the
openstack-python3-jobs template.

Fix pep8 errors that have crept in.

Disable shade jobs until they can get fixed.

Change-Id: I99871f28cd8a66adf5610104ca142c2871e99b0d
This commit is contained in:
Dr. Jens Harbott 2022-05-24 14:29:06 +02:00
parent 82a708b09f
commit 624cb97222
2 changed files with 10 additions and 11 deletions

View File

@ -1,8 +1,8 @@
- job: - job:
name: os-client-config-tox-py37-tips name: os-client-config-tox-py38-tips
parent: openstack-tox-py37 parent: openstack-tox-py38
description: | description: |
Run tox python 37 unittests against master of important libs Run tox python 38 unittests against master of important libs
vars: vars:
tox_install_siblings: true tox_install_siblings: true
zuul_work_dir: src/opendev.org/openstack/os-client-config zuul_work_dir: src/opendev.org/openstack/os-client-config
@ -15,22 +15,21 @@
name: os-client-config-tox-tips name: os-client-config-tox-tips
check: check:
jobs: jobs:
- os-client-config-tox-py37-tips - os-client-config-tox-py38-tips
gate: gate:
jobs: jobs:
- os-client-config-tox-py37-tips - os-client-config-tox-py38-tips
- project: - project:
templates: templates:
- check-requirements - check-requirements
- lib-forward-testing-python3 - lib-forward-testing-python3
- openstack-lower-constraints-jobs - openstack-python3-zed-jobs
- openstack-python3-ussuri-jobs
- os-client-config-tox-tips - os-client-config-tox-tips
- publish-openstack-docs-pti - publish-openstack-docs-pti
- release-notes-jobs-python3 - release-notes-jobs-python3
- shade-functional-tips # - shade-functional-tips
- shade-tox-tips # - shade-tox-tips
check: check:
jobs: jobs:
- openstack-tox-pep8 - openstack-tox-pep8

View File

@ -63,8 +63,8 @@ class TestCloudConfig(base.TestCase):
def test_iteration(self): def test_iteration(self):
cc = cloud_config.CloudConfig("test1", "region-al", fake_config_dict) cc = cloud_config.CloudConfig("test1", "region-al", fake_config_dict)
self.assertTrue('a' in cc) self.assertIn('a', cc)
self.assertFalse('x' in cc) self.assertNotIn('x', cc)
def test_equality(self): def test_equality(self):
cc1 = cloud_config.CloudConfig("test1", "region-al", fake_config_dict) cc1 = cloud_config.CloudConfig("test1", "region-al", fake_config_dict)