From 3228111af3e21561b578688ab406a0c1effaf397 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Tue, 18 Aug 2020 17:03:18 +0200
Subject: [PATCH] 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: If58a6088f92c4be5edd53f0f5cd9a093d4cbc5f1
---
 .zuul.yaml                                    |  5 ++---
 playbooks/post.yaml                           |  6 ------
 playbooks/python-cinderclient-functional.yaml | 14 --------------
 roles/get-os-environment/defaults/main.yaml   |  2 --
 roles/get-os-environment/tasks/main.yaml      | 12 ------------
 5 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 playbooks/post.yaml
 delete mode 100644 playbooks/python-cinderclient-functional.yaml
 delete mode 100644 roles/get-os-environment/defaults/main.yaml
 delete mode 100644 roles/get-os-environment/tasks/main.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 1f51c0481..e2accb180 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,14 +1,13 @@
 - job:
     name: python-cinderclient-functional-base
     abstract: true
-    parent: devstack
-    run: playbooks/python-cinderclient-functional.yaml
-    post-run: playbooks/post.yaml
+    parent: devstack-tox-functional
     timeout: 4500
     required-projects:
       - openstack/cinder
       - openstack/python-cinderclient
     vars:
+      openrc_enable_export: true
       devstack_localrc:
         USE_PYTHON3: true
         VOLUME_BACKING_FILE_SIZE: 16G
diff --git a/playbooks/post.yaml b/playbooks/post.yaml
deleted file mode 100644
index 9860e2a96..000000000
--- 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-cinderclient-functional.yaml b/playbooks/python-cinderclient-functional.yaml
deleted file mode 100644
index dec94d03c..000000000
--- a/playbooks/python-cinderclient-functional.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- hosts: all
-  roles:
-    - ensure-python
-    - 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_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 91190b325..000000000
--- 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 b3f457bbb..000000000
--- 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 }}"