summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Jens Harbott <harbott@osism.tech>2022-05-24 14:29:06 +0200
committerDr. Jens Harbott <harbott@osism.tech>2022-05-24 15:34:10 +0200
commit624cb972224ba473c98189be6f59a0ea57e7dec6 (patch)
tree359a214811d3764903f84aebd7368fe2bd028a32
parent82a708b09f944708a770e8c5ffae5ea98848ed46 (diff)
downloados-client-config-624cb972224ba473c98189be6f59a0ea57e7dec6.tar.gz
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
-rw-r--r--.zuul.yaml17
-rw-r--r--os_client_config/tests/test_cloud_config.py4
2 files changed, 10 insertions, 11 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 9850aea..669f917 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,8 @@
- job:
- name: os-client-config-tox-py37-tips
- parent: openstack-tox-py37
+ name: os-client-config-tox-py38-tips
+ parent: openstack-tox-py38
description: |
- Run tox python 37 unittests against master of important libs
+ Run tox python 38 unittests against master of important libs
vars:
tox_install_siblings: true
zuul_work_dir: src/opendev.org/openstack/os-client-config
@@ -15,22 +15,21 @@
name: os-client-config-tox-tips
check:
jobs:
- - os-client-config-tox-py37-tips
+ - os-client-config-tox-py38-tips
gate:
jobs:
- - os-client-config-tox-py37-tips
+ - os-client-config-tox-py38-tips
- project:
templates:
- check-requirements
- lib-forward-testing-python3
- - openstack-lower-constraints-jobs
- - openstack-python3-ussuri-jobs
+ - openstack-python3-zed-jobs
- os-client-config-tox-tips
- publish-openstack-docs-pti
- release-notes-jobs-python3
- - shade-functional-tips
- - shade-tox-tips
+ # - shade-functional-tips
+ # - shade-tox-tips
check:
jobs:
- openstack-tox-pep8
diff --git a/os_client_config/tests/test_cloud_config.py b/os_client_config/tests/test_cloud_config.py
index 2e80163..b12a8df 100644
--- a/os_client_config/tests/test_cloud_config.py
+++ b/os_client_config/tests/test_cloud_config.py
@@ -63,8 +63,8 @@ class TestCloudConfig(base.TestCase):
def test_iteration(self):
cc = cloud_config.CloudConfig("test1", "region-al", fake_config_dict)
- self.assertTrue('a' in cc)
- self.assertFalse('x' in cc)
+ self.assertIn('a', cc)
+ self.assertNotIn('x', cc)
def test_equality(self):
cc1 = cloud_config.CloudConfig("test1", "region-al", fake_config_dict)