From 448ff51dec96e2835b186268176d4d605abecbf7 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Wed, 17 Aug 2022 15:59:53 +0000 Subject: [PATCH] Drop py3.6/7, T, U jobs and fix neutron discovery python 3.6 and 3.7 are dropped (upstream tooling as e.g. Devstack doesn't support this those anymore) together with train and ussuri jobs. refstack-client jobs are non-voting now until a fix on refstack-client's side has landed. Also victoria jobs are marked as non-voting because they require a patch on devstack's side which isn't ready to be merged yet [1]. manila-tempest-plugin needs to be pinned in Victoria and Wallaby because the plugin requires newer tempest version than is available there. The patch also makes neutron version discovery with a not top level URL, seems like something changed because the discovery has been failing. [1] https://review.opendev.org/c/openstack/devstack/+/844774 Change-Id: Ia3d78e84ad9eee515eb8ca017ea84df1fd160929 --- .zuul.yaml | 72 ++++++++----------- config_tempest/services/network.py | 3 + .../python-tempestconf-tempest-devstack.yaml | 4 +- setup.cfg | 4 +- 4 files changed, 36 insertions(+), 47 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 33bd66a4..3dea965f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,16 +1,17 @@ - project: templates: - openstack-cover-jobs - - openstack-python36-jobs - - openstack-python37-jobs - openstack-python3-zed-jobs - release-notes-jobs-python3 check: jobs: - python-tempestconf-tempest-devstack-admin - - python-tempestconf-tempest-devstack-admin-train - - python-tempestconf-tempest-devstack-admin-ussuri - - python-tempestconf-tempest-devstack-admin-victoria + # TODO(kopecmartin) this job requires the following fix on devstack's + # side - https://review.opendev.org/c/openstack/devstack/+/844774 + # Although that fix requires further work so in the meantime let's + # mark this job as non-voting to unblock the gates + - python-tempestconf-tempest-devstack-admin-victoria: + voting: false - python-tempestconf-tempest-devstack-admin-wallaby - python-tempestconf-tempest-devstack-admin-xena - python-tempestconf-tempest-devstack-admin-yoga @@ -20,7 +21,13 @@ voting: false - python-tempestconf-tempest-packstack-demo: voting: false + # TODO(kopecmartin) refstack-client jobs are broken - tempest version + # in those jobs must be bumped in order to be incompatible with + # manila-tempest-plugin - right now they fail to install the plugin, + # until the following patch is merged, let's mark this non-voting + # https://review.opendev.org/c/openinfra/refstack-client/+/846370 - refstack-client-devstack-master: + voting: false irrelevant-files: &irrelevant-files - config_tempest/tests/.*$ - ^doc/.*$ @@ -57,16 +64,23 @@ gate: jobs: - python-tempestconf-tempest-devstack-admin - - python-tempestconf-tempest-devstack-admin-train - - python-tempestconf-tempest-devstack-admin-ussuri - - python-tempestconf-tempest-devstack-admin-victoria + # TODO(kopecmartin) this job requires the following fix on devstack's + # side - https://review.opendev.org/c/openstack/devstack/+/844774 + # Although that fix requires further work so in the meantime let's + # mark this job as non-voting to unblock the gates + #- python-tempestconf-tempest-devstack-admin-victoria - python-tempestconf-tempest-devstack-admin-wallaby - python-tempestconf-tempest-devstack-admin-xena - python-tempestconf-tempest-devstack-admin-yoga - python-tempestconf-tempest-devstack-demo - python-tempestconf-tempest-devstack-admin-plugins - - refstack-client-devstack-master: - irrelevant-files: *irrelevant-files + # TODO(kopecmartin) refstack-client jobs are broken - tempest version + # in those jobs must be bumped in order to be incompatible with + # manila-tempest-plugin - right now they fail to install the plugin, + # until the following patch is merged, let's skip this job + # https://review.opendev.org/c/openinfra/refstack-client/+/846370 + #- refstack-client-devstack-master: + # irrelevant-files: *irrelevant-files - tripleo-ci-centos-9-content-provider: irrelevant-files: *irrelevant-files - tripleo-ci-centos-9-scenario002-standalone: @@ -85,14 +99,10 @@ - opendev-promote-docs experimental: jobs: - - python-tempestconf-tempest-devstack-demo-train - - python-tempestconf-tempest-devstack-demo-ussuri - python-tempestconf-tempest-devstack-demo-victoria - python-tempestconf-tempest-devstack-demo-wallaby - python-tempestconf-tempest-devstack-demo-xena - python-tempestconf-tempest-devstack-demo-yoga - - refstack-client-devstack-train - - refstack-client-devstack-ussuri - refstack-client-devstack-victoria - refstack-client-devstack-wallaby - refstack-client-devstack-xena @@ -220,26 +230,15 @@ cloud_user: devstack-admin tempest_concurrency: 2 -- job: - name: python-tempestconf-tempest-devstack-admin-train - parent: python-tempestconf-tempest-devstack-admin - override-checkout: stable/train - vars: - branch: stable/train - -- job: - name: python-tempestconf-tempest-devstack-admin-ussuri - parent: python-tempestconf-tempest-devstack-admin - override-checkout: stable/ussuri - vars: - branch: stable/ussuri - - job: name: python-tempestconf-tempest-devstack-admin-victoria parent: python-tempestconf-tempest-devstack-admin override-checkout: stable/victoria vars: branch: stable/victoria + required-projects: &manila-tempest-plugin-pin + - name: openstack/manila-tempest-plugin + override-checkout: 1.8.0 - job: name: python-tempestconf-tempest-devstack-admin-wallaby @@ -247,6 +246,7 @@ override-checkout: stable/wallaby vars: branch: stable/wallaby + required-projects: *manila-tempest-plugin-pin - job: name: python-tempestconf-tempest-devstack-admin-xena @@ -281,26 +281,13 @@ # is resolved tempest_exclude_regex: 'tempest.api.compute.servers' -- job: - name: python-tempestconf-tempest-devstack-demo-train - parent: python-tempestconf-tempest-devstack-demo - override-checkout: stable/train - vars: - branch: stable/train - -- job: - name: python-tempestconf-tempest-devstack-demo-ussuri - parent: python-tempestconf-tempest-devstack-demo - override-checkout: stable/ussuri - vars: - branch: stable/ussuri - - job: name: python-tempestconf-tempest-devstack-demo-victoria parent: python-tempestconf-tempest-devstack-demo override-checkout: stable/victoria vars: branch: stable/victoria + required-projects: *manila-tempest-plugin-pin - job: name: python-tempestconf-tempest-devstack-demo-wallaby @@ -308,6 +295,7 @@ override-checkout: stable/wallaby vars: branch: stable/wallaby + required-projects: *manila-tempest-plugin-pin - job: name: python-tempestconf-tempest-devstack-demo-xena diff --git a/config_tempest/services/network.py b/config_tempest/services/network.py index 52ab38de..4cb74f47 100644 --- a/config_tempest/services/network.py +++ b/config_tempest/services/network.py @@ -25,6 +25,9 @@ class NetworkService(VersionedService): body = json.loads(body) self.extensions = list(map(lambda x: x['alias'], body['extensions'])) + def set_versions(self): + super(NetworkService, self).set_versions(top_level=False) + def create_tempest_networks(self, conf, network_id): LOG.info("Setting up network") self.client = self.client.networks diff --git a/playbooks/python-tempestconf-tempest-devstack.yaml b/playbooks/python-tempestconf-tempest-devstack.yaml index be96e2ec..9539ae82 100644 --- a/playbooks/python-tempestconf-tempest-devstack.yaml +++ b/playbooks/python-tempestconf-tempest-devstack.yaml @@ -53,7 +53,7 @@ name: run-tempest when: - plugins_paths is not defined - - branch is not defined or (branch is defined and branch not in ["stable/train"]) + - branch is not defined or (branch is defined and branch not in ["stable/victoria"]) - name: Run Tempest Tests Tempest version <= 26.0.0 include_role: @@ -61,7 +61,7 @@ when: - plugins_paths is not defined - branch is defined - - branch in ["stable/train"] + - branch in ["stable/victoria"] - when: plugins_paths is defined block: diff --git a/setup.cfg b/setup.cfg index d8545ca4..ddf68920 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ description_file = author = OpenStack author_email = openstack-discuss@lists.openstack.org home_page = https://pypi.org/project/python-tempestconf -python_requires = >=3.6 +python_requires = >=3.8 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -17,8 +17,6 @@ classifier = Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9