diff options
-rw-r--r-- | .zuul.yaml | 5 | ||||
-rw-r--r-- | playbooks/post.yaml | 6 | ||||
-rw-r--r-- | playbooks/python-novaclient-functional.yaml | 14 | ||||
-rw-r--r-- | roles/get-os-environment/defaults/main.yaml | 2 | ||||
-rw-r--r-- | roles/get-os-environment/tasks/main.yaml | 12 |
5 files changed, 2 insertions, 37 deletions
@@ -1,13 +1,12 @@ - job: name: python-novaclient-functional - parent: devstack - run: playbooks/python-novaclient-functional.yaml - post-run: playbooks/post.yaml + parent: devstack-tox-functional timeout: 7200 required-projects: - openstack/nova - openstack/python-novaclient vars: + openrc_enable_export: true devstack_localrc: USE_PYTHON3: true irrelevant-files: diff --git a/playbooks/post.yaml b/playbooks/post.yaml deleted file mode 100644 index 9860e2a9..00000000 --- a/playbooks/post.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: all - vars: - tox_envlist: functional - roles: - - fetch-tox-output - - fetch-subunit-output diff --git a/playbooks/python-novaclient-functional.yaml b/playbooks/python-novaclient-functional.yaml deleted file mode 100644 index ea7d2db2..00000000 --- a/playbooks/python-novaclient-functional.yaml +++ /dev/null @@ -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 }}" diff --git a/roles/get-os-environment/defaults/main.yaml b/roles/get-os-environment/defaults/main.yaml deleted file mode 100644 index 91190b32..00000000 --- a/roles/get-os-environment/defaults/main.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -openrc_file: "{{ devstack_base_dir|default('/opt/stack') }}/devstack/openrc" diff --git a/roles/get-os-environment/tasks/main.yaml b/roles/get-os-environment/tasks/main.yaml deleted file mode 100644 index b3f457bb..00000000 --- a/roles/get-os-environment/tasks/main.yaml +++ /dev/null @@ -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 }}" |