From bf2ca3ad1211dc40c24d63b290f82ab039b15057 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Fri, 27 Jan 2023 11:39:29 +0100 Subject: Fix CI - Remove reno job, it does not make sense to run it on bugfix branches. - Cap tox to version lower than 4 as it is for all stable branches. - Run tests on focal for all except bionic with python 3.6 Change-Id: I290041b1b4a145bb9f06d62122da340794fbc076 --- tox.ini | 3 ++- zuul.d/ironic-python-agent-jobs.yaml | 8 ++++++++ zuul.d/project.yaml | 5 ++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 4c47f960..719a24d7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,9 @@ [tox] minversion = 3.18.0 -skipsdist = True envlist = py3,functional,pep8 ignore_basepython_conflict=true +requires = + tox<4 [testenv] usedevelop = True diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml index bc91ec80..db5c2597 100644 --- a/zuul.d/ironic-python-agent-jobs.yaml +++ b/zuul.d/ironic-python-agent-jobs.yaml @@ -101,6 +101,7 @@ # Security testing for known issues name: ipa-tox-bandit parent: openstack-tox + nodeset: ubuntu-focal timeout: 2400 vars: tox_envlist: bandit @@ -118,6 +119,7 @@ - job: name: ipa-tox-examples parent: openstack-tox + nodeset: ubuntu-focal timeout: 600 vars: tox_envlist: examples @@ -194,28 +196,34 @@ check: jobs: - openstack-tox-pep8: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga - openstack-tox-py36: + nodeset: ubuntu-bionic required-projects: - name: openstack/requirements override-checkout: stable/yoga - openstack-tox-py39: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga gate: jobs: - openstack-tox-pep8: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga - openstack-tox-py36: + nodeset: ubuntu-bionic required-projects: - name: openstack/requirements override-checkout: stable/yoga - openstack-tox-py39: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 448deca9..d035cc4c 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -3,14 +3,15 @@ - check-requirements - openstack-python3-yoga-jobs-ironic-bugfix - publish-openstack-docs-pti - - release-notes-jobs-python3 check: jobs: - openstack-tox-functional: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga - openstack-tox-cover: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga @@ -35,10 +36,12 @@ gate: jobs: - openstack-tox-functional: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga - openstack-tox-cover: + nodeset: ubuntu-focal required-projects: - name: openstack/requirements override-checkout: stable/yoga -- cgit v1.2.1