From bda6d4ce78d7cf48c783fae6a4553b34aabc51b2 Mon Sep 17 00:00:00 2001 From: Sayali Naval Date: Tue, 15 Nov 2022 14:59:40 -0800 Subject: [PATCH] Add support for zed Change-Id: Ic3924b83d5ca17b403c2e340509e46f92fd566df --- .zuul.yaml | 26 +++++--------------------- gbpclient/tests/unit/test_port.py | 2 +- gbpclient/tests/unit/test_subnet.py | 2 +- tox.ini | 2 +- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 133a155..358831e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,7 +1,7 @@ - project: name: x/python-group-based-policy-client templates: - - openstack-python3-yoga-jobs + - openstack-python3-zed-jobs - publish-to-pypi # REVISIT: In the jobs below, the required-projects clause is needed on # the master branch to select the correct version of the requirements @@ -14,34 +14,18 @@ - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/yoga - - openstack-tox-py36: - required-projects: - - name: openstack/requirements - override-checkout: stable/yoga - - openstack-tox-py37: - required-projects: - - name: openstack/requirements - override-checkout: stable/yoga + override-checkout: stable/zed - openstack-tox-py38: required-projects: - name: openstack/requirements - override-checkout: stable/yoga + override-checkout: stable/zed gate: jobs: - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/yoga - - openstack-tox-py36: - required-projects: - - name: openstack/requirements - override-checkout: stable/yoga - - openstack-tox-py37: - required-projects: - - name: openstack/requirements - override-checkout: stable/yoga + override-checkout: stable/zed - openstack-tox-py38: required-projects: - name: openstack/requirements - override-checkout: stable/yoga + override-checkout: stable/zed diff --git a/gbpclient/tests/unit/test_port.py b/gbpclient/tests/unit/test_port.py index 97d2b61..263a63f 100644 --- a/gbpclient/tests/unit/test_port.py +++ b/gbpclient/tests/unit/test_port.py @@ -33,7 +33,7 @@ class TestPortCreate(test_port.TestPort, test_cli20.CLITestV20Base): super(TestPortCreate, self).setUp() self.app.client_manager.network.find_extension = mock.Mock( return_value=self.extension_details) - fake_net = network_fakes.FakeNetwork.create_one_network({ + fake_net = network_fakes.create_one_network({ 'id': self._port.network_id, }) self.network.find_network = mock.Mock(return_value=fake_net) diff --git a/gbpclient/tests/unit/test_subnet.py b/gbpclient/tests/unit/test_subnet.py index fc6900f..17f6ffc 100644 --- a/gbpclient/tests/unit/test_subnet.py +++ b/gbpclient/tests/unit/test_subnet.py @@ -31,7 +31,7 @@ class TestSubnetCreate(test_subnet.TestSubnet, test_cli20.CLITestV20Base): 'tenant_id': '1', } ) - self._network = network_fakes.FakeNetwork.create_one_network( + self._network = network_fakes.create_one_network( attrs={ 'id': self._subnet.network_id, } diff --git a/tox.ini b/tox.ini index 99c12eb..01a6e4f 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install {opts} {packages} deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs}