From 74a4a19b714a9496bf0967cb3482a59335803c82 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Mon, 13 Aug 2018 22:02:38 +0000
Subject: Use Swift's in-tree DSVM test

While we're at it, make a new job that inherits from it to bring the
legacy-swiftclient-dsvm-functional testing in-tree, too.

For naming, follow naming policy and remove "dsvm" from names.

Remove legacy jobs, they are not needed anymore.

Note this backport follows change 600346 and uses
an identity-v2 job in addition.

Change-Id: I919c0b77ac4888350194f55a9c12e0742845024f
Depends-On: https://review.openstack.org/600346
(cherry picked from commit 70e20b62e6719c97267aa0e5a80dae2e31dfba76)
---
 .zuul.yaml | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 64 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2d001c1..9ed24d5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,59 @@
+- job:
+    name: swiftclient-swift-functional
+    parent: swift-dsvm-functional
+    description: |
+      Run swift's functional tests with python-swiftclient
+      installed from source instead as package from PyPI.
+    # Ensure that we install python-swiftclient from git and
+    # do not install from pypi. This is needed since the parent
+    # job sets zuul_work_dir to the swift directory and uses tox
+    # for installation.
+    required-projects:
+      - git.openstack.org/openstack/python-swiftclient
+
+- job:
+    name: swiftclient-swift-functional-identity-v2
+    parent: swift-dsvm-functional-identity-v2
+    description: |
+      Run swift's functional tests with python-swiftclient
+      installed from source instead as package from PyPI.
+
+      This uses Identity API 2.0.
+    # Ensure that we install python-swiftclient from git and
+    # do not install from pypi. This is needed since the parent
+    # job sets zuul_work_dir to the swift directory and uses tox
+    # for installation.
+    required-projects:
+      - git.openstack.org/openstack/python-swiftclient
+
+- job:
+    name: swiftclient-functional
+    parent: swift-dsvm-functional
+    description: |
+      Run functional tests of python-swiftclient with
+      python-swiftclient installed from source instead as package from
+      PyPI.
+
+      This uses Identity API 2.0.
+    required-projects:
+      - git.openstack.org/openstack/python-swiftclient
+    vars:
+      # Override value from parent job to use swiftclient tests
+      zuul_work_dir: "{{ zuul.projects['git.openstack.org/openstack/python-swiftclient'].src_dir }}"
+
+- job:
+    name: swiftclient-functional-identity-v2
+    parent: swift-dsvm-functional-identity-v2
+    description: |
+      Run functional tests of python-swiftclient with
+      python-swiftclient installed from source instead as package from
+      PyPI.
+    required-projects:
+      - git.openstack.org/openstack/python-swiftclient
+    vars:
+      # Override value from parent job to use swiftclient tests
+      zuul_work_dir: "{{ zuul.projects['git.openstack.org/openstack/python-swiftclient'].src_dir }}"
+
 - project:
     templates:
       - openstack-python-jobs
@@ -9,18 +65,20 @@
       - release-notes-jobs
     check:
       jobs:
-        - legacy-swift-dsvm-functional
-        - legacy-swift-dsvm-functional-identity-v3-only:
+        - swiftclient-swift-functional:
             voting: false
-        - legacy-swiftclient-dsvm-functional
-        - legacy-swiftclient-dsvm-functional-identity-v3-only:
+        - swiftclient-functional:
             voting: false
+        - swiftclient-swift-functional-identity-v2
+        - swiftclient-functional-identity-v2
         - openstack-tox-py36:
             voting: false
     gate:
       jobs:
-        - legacy-swift-dsvm-functional
-        - legacy-swiftclient-dsvm-functional
+        - swiftclient-swift-functional
+        - swiftclient-functional
+        - swiftclient-swift-functional-identity-v2
+        - swiftclient-functional-identity-v2
     post:
       jobs:
         - openstack-tox-cover
-- 
cgit v1.2.1