From 835fd3b9e4cbb33a297e979db93df55498ff6ce0 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Wed, 4 May 2022 16:53:00 +0200 Subject: [PATCH] Use zed jobs Also leave py3.6 test as it's still trendy Remove l-c job definition from tox.ini, it was not used anyway and we're removing l-c jobs everywhere Fix tempest test Change-Id: Ibdb5be75cf9e1c7a2ce26c05ee1e5e5d85d20482 --- tox.ini | 6 ------ zuul.d/project.yaml | 4 +++- zuul.d/virtualbmc-jobs.yaml | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index 8988536..37200f9 100644 --- a/tox.ini +++ b/tox.ini @@ -71,9 +71,3 @@ import-order-style = pep8 application-import-names = virtualbmc exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build max-complexity=17 - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e320da0..322137c 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -2,12 +2,14 @@ templates: - check-requirements - openstack-cover-jobs - - openstack-python3-yoga-jobs + - openstack-python3-zed-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 check: jobs: + - openstack-tox-py36 - virtualbmc-tempest-ironic gate: jobs: + - openstack-tox-py36 - virtualbmc-tempest-ironic diff --git a/zuul.d/virtualbmc-jobs.yaml b/zuul.d/virtualbmc-jobs.yaml index d69d3ab..c594539 100644 --- a/zuul.d/virtualbmc-jobs.yaml +++ b/zuul.d/virtualbmc-jobs.yaml @@ -15,6 +15,7 @@ vars: devstack_localrc: EBTABLES_RACE_FIX: True + IRONIC_BOOT_MODE: bios IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_DEFAULT_RESCUE_INTERFACE: "" devstack_services: