From 1d6521944597b0271817ca7eaebd51348df61e41 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Mon, 6 Aug 2018 19:25:36 +0000
Subject: [PATCH] Move legacy-swift-dsvm-functional job in-tree

Note that there's no swift-dsvm-functional-identity-v3-only because
as of the Queens release, that's the *only* way Keystone gets deployed.

Change-Id: I49d963b98f3df21fea0db24c83553ef873ad73c8
---
 .zuul.yaml                     | 43 ++++++++++++++++++++++++++++++++++
 tools/playbooks/dsvm/post.yaml |  4 ++++
 tools/playbooks/dsvm/pre.yaml  |  9 +++++++
 tools/playbooks/dsvm/run.yaml  | 11 +++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 tools/playbooks/dsvm/post.yaml
 create mode 100644 tools/playbooks/dsvm/pre.yaml
 create mode 100644 tools/playbooks/dsvm/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 2fc5406318..30d97f9262 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -117,6 +117,39 @@
     vars:
       tox_envlist: func-s3api
 
+- job:
+    name: swift-dsvm-functional
+    parent: devstack-minimal
+    description: |
+      Setup a Swift/Keystone environment and run Swift's func tests
+    required-projects:
+      - git.openstack.org/openstack/requirements
+      - git.openstack.org/openstack/swift
+      - git.openstack.org/openstack/keystone
+    timeout: 2700
+    vars:
+      tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
+      # This tox env get run twice; once for Keystone and once for tempauth
+      tox_envlist: func
+      devstack_localrc:
+        SWIFT_HASH: changeme
+        # We don't need multiple replicas to run purely functional tests.
+        # In fact, devstack special cases some things when there's only
+        # one replica.
+        SWIFT_REPLICAS: 1
+        # One replica => no need for replicators, etc.
+        SWIFT_START_ALL_SERVICES: False
+        # Keystone v3 is currently the default, but may as well be explicit
+        ENABLE_IDENTITY_V2: False
+        IDENTITY_API_VERSION: 3
+      devstack_services:
+        keystone: true
+        swift: true
+      zuul_work_dir: src/git.openstack.org/openstack/swift
+    pre-run: tools/playbooks/dsvm/pre.yaml
+    run: tools/playbooks/dsvm/run.yaml
+    post-run: tools/playbooks/dsvm/post.yaml
+
 - job:
     name: swift-probetests-centos-7
     parent: unittests
@@ -174,6 +207,11 @@
               - ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
               - ^test/(unit|functional)/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
+        - swift-dsvm-functional:
+            irrelevant-files:
+              - ^(api-ref|doc|releasenotes)/.*$
+              - ^test/probe/.*$
+              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
         - legacy-tempest-dsvm-neutron-full:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$
@@ -208,6 +246,11 @@
               - ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
               - ^test/(unit|functional)/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
+        - swift-dsvm-functional:
+            irrelevant-files:
+              - ^(api-ref|doc|releasenotes)/.*$
+              - ^test/probe/.*$
+              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
         - legacy-tempest-dsvm-neutron-full:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$
diff --git a/tools/playbooks/dsvm/post.yaml b/tools/playbooks/dsvm/post.yaml
new file mode 100644
index 0000000000..7f0cb19824
--- /dev/null
+++ b/tools/playbooks/dsvm/post.yaml
@@ -0,0 +1,4 @@
+- hosts: all
+  roles:
+    - fetch-tox-output
+    - fetch-subunit-output
diff --git a/tools/playbooks/dsvm/pre.yaml b/tools/playbooks/dsvm/pre.yaml
new file mode 100644
index 0000000000..3a089d1761
--- /dev/null
+++ b/tools/playbooks/dsvm/pre.yaml
@@ -0,0 +1,9 @@
+- hosts: all
+  roles:
+    - orchestrate-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
+    - ensure-tox
diff --git a/tools/playbooks/dsvm/run.yaml b/tools/playbooks/dsvm/run.yaml
new file mode 100644
index 0000000000..b0e96bc79b
--- /dev/null
+++ b/tools/playbooks/dsvm/run.yaml
@@ -0,0 +1,11 @@
+- hosts: all
+  tasks:
+    - name: Run func tests with Keystone users
+      include_role:
+        name: tox
+    - name: Run func tests with tempauth users
+      include_role:
+        name: tox
+      vars:
+        tox_environment:
+          SWIFT_TEST_CONFIG_FILE: test/sample.conf