Fix tox<4 issue for zed job

Added task to install proper version
of tox(<4) so the job won't fail and
set the job as voting again. Set
ensure_tox_version to <4 for zed admin
job and admin plugins job (since it failed,
on tox>4 related issue too.

Story: 2010573
Task: 47319
Depends-On: https://review.opendev.org/c/openstack/tempest/+/884584
Change-Id: I0e9ad3632d16a5aa8c0e98d3e0d10bee79cead99
This commit is contained in:
Roman Popelka 2023-04-26 12:57:08 +02:00
parent 468044fa98
commit 9ff70dd6bc
2 changed files with 20 additions and 34 deletions

View File

@ -6,28 +6,13 @@
check:
jobs:
- openstack-tox-py39
# temporarily n-v to unblock the gates, the job is fixed by
# https://review.opendev.org/c/openinfra/python-tempestconf/+/881551
- python-tempestconf-tempest-devstack-admin:
voting: false
# temporarily n-v to unblock the gates, the job is fixed by
# https://review.opendev.org/c/openinfra/python-tempestconf/+/881551
- python-tempestconf-tempest-devstack-admin-yoga:
voting: false
# temporarily marked to n-v, there is a bug
# https://storyboard.openstack.org/#!/story/2010573
- python-tempestconf-tempest-devstack-admin-zed:
voting: false
- python-tempestconf-tempest-devstack-admin
- python-tempestconf-tempest-devstack-admin-yoga
- python-tempestconf-tempest-devstack-admin-zed
- python-tempestconf-tempest-devstack-admin-2023-1
- python-tempestconf-tempest-devstack-demo
# temporarily n-v to unblock the gates, the job is fixed by
# https://review.opendev.org/c/openinfra/python-tempestconf/+/881551
- python-tempestconf-tempest-devstack-admin-plugins:
voting: false
# temporarily n-v to unblock the gates, the job is fixed by
# https://review.opendev.org/c/openinfra/python-tempestconf/+/881551
- python-tempestconf-tempest-devstack-enforce-scope-new-defaults-admin:
voting: false
- python-tempestconf-tempest-devstack-admin-plugins
- python-tempestconf-tempest-devstack-enforce-scope-new-defaults-admin
- python-tempestconf-tempest-devstack-enforce-scope-new-defaults-demo
- python-tempestconf-tempest-packstack-admin:
voting: false
@ -76,12 +61,12 @@
gate:
jobs:
- openstack-tox-py39
# - python-tempestconf-tempest-devstack-admin
# - python-tempestconf-tempest-devstack-admin-yoga
# - python-tempestconf-tempest-devstack-admin-zed
- python-tempestconf-tempest-devstack-admin
- python-tempestconf-tempest-devstack-admin-yoga
- python-tempestconf-tempest-devstack-admin-zed
- python-tempestconf-tempest-devstack-admin-2023-1
- python-tempestconf-tempest-devstack-demo
# - python-tempestconf-tempest-devstack-admin-plugins
- python-tempestconf-tempest-devstack-admin-plugins
- refstack-client-devstack-master:
irrelevant-files: *irrelevant-files
# - tripleo-ci-centos-9-content-provider:
@ -232,6 +217,7 @@
- "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/designate-tempest-plugin'].src_dir }}"
- "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/barbican-tempest-plugin'].src_dir }}"
tempest_concurrency: 2
ensure_tox_version: '<4'
- job:
name: python-tempestconf-tempest-devstack-admin
@ -257,6 +243,7 @@
override-checkout: stable/zed
vars:
branch: stable/zed
ensure_tox_version: '<4'
- job:
name: python-tempestconf-tempest-devstack-admin-2023-1

View File

@ -2,6 +2,15 @@
roles:
# the role is inherited from openstack/devstack project
- run-devstack
tasks:
- name: Ensure tox (system-wide)
shell: |
python3 -m pip install "tox{{ ensure_tox_version }}"
args:
executable: /bin/bash
become: true
when:
- ensure_tox_version is defined
- hosts: tempest
vars:
@ -18,16 +27,6 @@
include_role:
name: setup-tempest-data-dir
# NOTE: devstack jobs are failing on Run Tempest task
# it is because tox command is not found. Adding 'ensure-tox'
# role here to make sure that tox is installed and it
# will not break the tempest tests.
- name: Ensure tox is installed
include_role:
name: ensure-tox
vars:
ensure_global_symlinks: True
- name: ACL devstack files
include_role:
name: acl-devstack-files