From 5872184a6936c051974d867651f24369452da280 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 26 Jan 2018 08:36:44 -0600
Subject: [PATCH] Use devstack functional test base job

We extracted some of our functional base job to the devstack repo.
Consume it.

Change-Id: I0b5172384ed1f4017d4f4ada7f4dadc5593f14be
---
 .zuul.yaml                   | 8 +-------
 playbooks/devstack/post.yaml | 4 ----
 playbooks/devstack/pre.yaml  | 8 --------
 playbooks/devstack/run.yaml  | 3 ---
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 playbooks/devstack/post.yaml
 delete mode 100644 playbooks/devstack/pre.yaml
 delete mode 100644 playbooks/devstack/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 388e62f45..c54632b3b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -41,12 +41,9 @@
 
 - job:
     name: openstacksdk-functional-devstack-base
-    parent: devstack
+    parent: devstack-tox-functional-consumer
     description: |
       Base job for devstack-based functional tests
-    pre-run: playbooks/devstack/pre.yaml
-    run: playbooks/devstack/run.yaml
-    post-run: playbooks/devstack/post.yaml
     required-projects:
       # These jobs will DTRT when openstacksdk triggers them, but we want to
       # make sure stable branches of openstacksdk never get cloned by other
@@ -62,15 +59,12 @@
       - name: openstack/swift
     timeout: 9000
     vars:
-      devstack_localrc:
-        SWIFT_HASH: '1234123412341234'
       devstack_local_conf:
         post-config:
           $CINDER_CONF:
             DEFAULT:
               osapi_max_limit: 6
       devstack_services:
-        horizon: false
         s-account: true
         s-container: true
         s-object: true
diff --git a/playbooks/devstack/post.yaml b/playbooks/devstack/post.yaml
deleted file mode 100644
index 7f0cb1982..000000000
--- a/playbooks/devstack/post.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: all
-  roles:
-    - fetch-tox-output
-    - fetch-subunit-output
diff --git a/playbooks/devstack/pre.yaml b/playbooks/devstack/pre.yaml
deleted file mode 100644
index 3ec41c9cb..000000000
--- a/playbooks/devstack/pre.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- hosts: all
-  roles:
-    - run-devstack
-    - role: bindep
-      bindep_profile: test
-      bindep_dir: "{{ zuul_work_dir }}"
-    - test-setup
-    - ensure-tox
diff --git a/playbooks/devstack/run.yaml b/playbooks/devstack/run.yaml
deleted file mode 100644
index 22f82096c..000000000
--- a/playbooks/devstack/run.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - tox