zuul functional job: drop the custom playbooks
The base devstack-tox-functional* jobs now set the required environment (OS_* vars set by devstack) before calling tox. Depends-On: https://review.opendev.org/746235 Change-Id: I7b6d49ea8320e014e2ef444e456f6eea02eca912
This commit is contained in:
parent
2ed34e657c
commit
553257d1b7
@ -1,13 +1,12 @@
|
|||||||
- job:
|
- job:
|
||||||
name: python-novaclient-functional
|
name: python-novaclient-functional
|
||||||
parent: devstack
|
parent: devstack-tox-functional
|
||||||
run: playbooks/python-novaclient-functional.yaml
|
|
||||||
post-run: playbooks/post.yaml
|
|
||||||
timeout: 7200
|
timeout: 7200
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack/nova
|
- openstack/nova
|
||||||
- openstack/python-novaclient
|
- openstack/python-novaclient
|
||||||
vars:
|
vars:
|
||||||
|
openrc_enable_export: true
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
USE_PYTHON3: true
|
USE_PYTHON3: true
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
- hosts: all
|
|
||||||
vars:
|
|
||||||
tox_envlist: functional
|
|
||||||
roles:
|
|
||||||
- fetch-tox-output
|
|
||||||
- fetch-subunit-output
|
|
@ -1,14 +0,0 @@
|
|||||||
- hosts: all
|
|
||||||
roles:
|
|
||||||
- run-devstack
|
|
||||||
# Run bindep and test-setup after devstack so that they won't interfere
|
|
||||||
- role: bindep
|
|
||||||
bindep_profile: test
|
|
||||||
bindep_dir: "{{ zuul_work_dir }}"
|
|
||||||
- test-setup
|
|
||||||
- get-os-environment
|
|
||||||
- ensure-tox
|
|
||||||
- role: tox
|
|
||||||
tox_envlist: functional
|
|
||||||
tox_install_siblings: false
|
|
||||||
environment: "{{ os_env_vars }}"
|
|
@ -1,2 +0,0 @@
|
|||||||
---
|
|
||||||
openrc_file: "{{ devstack_base_dir|default('/opt/stack') }}/devstack/openrc"
|
|
@ -1,12 +0,0 @@
|
|||||||
- name: Extract the OS_ environment variables
|
|
||||||
shell:
|
|
||||||
cmd: |
|
|
||||||
source {{ openrc_file }} admin admin &>/dev/null
|
|
||||||
env | awk -F= 'BEGIN {print "---" } /^OS_/ { print " "$1": \""$2"\""} '
|
|
||||||
args:
|
|
||||||
executable: "/bin/bash"
|
|
||||||
register: env_os
|
|
||||||
|
|
||||||
- name: Save the OS_ environment variables as a fact
|
|
||||||
set_fact:
|
|
||||||
os_env_vars: "{{ env_os.stdout|from_yaml }}"
|
|
Loading…
x
Reference in New Issue
Block a user