Merge "Fix: do not lose the tox_environment value in func tests"

This commit is contained in:
Zuul 2020-10-13 10:22:08 +00:00 committed by Gerrit Code Review
commit 6e68add275
4 changed files with 5 additions and 6 deletions

View File

@ -8,5 +8,4 @@
- test-setup
- ensure-tox
- get-devstack-os-environment
- role: tox
tox_environment: "{{ os_env_vars|default({}) }}"
- tox

View File

@ -1,5 +1,4 @@
- hosts: all
roles:
- get-devstack-os-environment
- role: tox
tox_environment: "{{ os_env_vars|default({}) }}"
- tox

View File

@ -3,3 +3,4 @@ openrc_file: "{{ devstack_base_dir }}/devstack/openrc"
openrc_user: admin
openrc_project: admin
openrc_enable_export: false
tox_environment: {}

View File

@ -9,6 +9,6 @@
executable: "/bin/bash"
register: env_os
- name: Save the OS_ environment variables as a fact
- name: Append the the OS_ environment variables to tox_environment
set_fact:
os_env_vars: "{{ env_os.stdout|from_yaml }}"
tox_environment: "{{ env_os.stdout|from_yaml|default({})|combine(tox_environment) }}"