Merge "Respect global tox_environment for molecule"

This commit is contained in:
Zuul
2026-03-27 15:11:19 +00:00
committed by Gerrit Code Review
+6 -1
View File
@@ -143,7 +143,7 @@
name: openstack-ansible-tox-molecule
parent: tox-molecule
vars:
tox_environment:
tox_environment: &molecule_tox_env
TEST_BRANCH: "{{ zuul.branch }}"
OSA_TEST_REQUIREMENTS_FILE: "{{ ansible_user_dir }}/src/opendev.org/openstack/openstack-ansible/test-requirements.txt"
TOX_CONSTRAINTS_FILE: "{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
@@ -535,6 +535,7 @@
parent: openstack-ansible-tox-molecule
vars:
tox_environment:
<<: *molecule_tox_env
DOCKER_REGISTRY: quay.io/gotmax23
DOCKER_IMAGE_TAG: ubuntu-systemd:noble
@@ -587,6 +588,7 @@
nodeset: osa-nested-virt-noble
vars:
tox_environment:
<<: *molecule_tox_env
DOCKER_REGISTRY: quay.io/gotmax23
DOCKER_IMAGE_TAG: centos-systemd:stream10
@@ -657,6 +659,7 @@
parent: openstack-ansible-tox-molecule
vars:
tox_environment:
<<: *molecule_tox_env
DOCKER_REGISTRY: quay.io/gotmax23
DOCKER_IMAGE_TAG: debian-systemd:bookworm
@@ -667,6 +670,7 @@
parent: openstack-ansible-tox-molecule
vars:
tox_environment:
<<: *molecule_tox_env
DOCKER_REGISTRY: quay.io/rockylinux
DOCKER_IMAGE_TAG: rockylinux:10-ubi-init
@@ -870,5 +874,6 @@
parent: openstack-ansible-tox-molecule
vars:
tox_environment:
<<: *molecule_tox_env
DOCKER_REGISTRY: quay.io/gotmax23
DOCKER_IMAGE_TAG: debian-systemd:trixie