From dd4112aceae4d47fc573f8e867e9705e9bd7bf85 Mon Sep 17 00:00:00 2001
From: Luka Peschke <luka.peschke@objectif-libre.com>
Date: Tue, 27 Aug 2019 09:51:09 +0200
Subject: [PATCH] Add functional test jobs for the v2 client

This adds test jobs for the v2 client, in python2 and python3.

Work items:

* Remove the "functional" tox environment and introduce the "functional-v1"
  and "functional-v2" environments.

* Add zuul base jobs for python2 and python 3 testing. Two jobs inherit from
  each of these new jobs: one for the v1 client and one for the v2 client.

* Add "OS_ENDPOINT" to the list of environment variables forwarded to the
  functional test environments in order to ease local testing.

Change-Id: I54a43a1e844e92730afbf87316b9efe73a08d850
---
 .zuul.yaml | 47 +++++++++++++++++++++++++++++++++++++++--------
 tox.ini    | 12 +++++++++---
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2d9780f..8827359 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: cloudkittyclient-devstack-functional
+    name: cloudkittyclient-devstack-functional-base
     parent: devstack
     description: |
       Job for cloudkittyclient functional tests
@@ -26,11 +26,22 @@
         horizon: false
       tox_install_siblings: false
       zuul_work_dir: src/opendev.org/openstack/python-cloudkittyclient
-      tox_envlist: functional
 
 - job:
-    name: cloudkittyclient-devstack-functional-py3
-    parent: cloudkittyclient-devstack-functional
+    name: cloudkittyclient-devstack-functional-v1-client
+    parent: cloudkittyclient-devstack-functional-base
+    vars:
+      tox_envlist: functional-v1
+
+- job:
+    name: cloudkittyclient-devstack-functional-v2-client
+    parent: cloudkittyclient-devstack-functional-base
+    vars:
+      tox_envlist: functional-v2
+
+- job:
+    name: cloudkittyclient-devstack-functional-base-py3
+    parent: cloudkittyclient-devstack-functional-base
     description: |
       Job for cloudkittyclient functional tests, ran in python3.
     vars:
@@ -38,6 +49,18 @@
         DEVSTACK_GATE_USE_PYTHON3: "True"
         USE_PYTHON3: "True"
 
+- job:
+    name: cloudkittyclient-devstack-functional-v1-client-py3
+    parent: cloudkittyclient-devstack-functional-base-py3
+    vars:
+      tox_envlist: functional-v1
+
+- job:
+    name: cloudkittyclient-devstack-functional-v2-client-py3
+    parent: cloudkittyclient-devstack-functional-base-py3
+    vars:
+      tox_envlist: functional-v2
+
 - project:
     templates:
       - openstack-lower-constraints-jobs
@@ -49,13 +72,21 @@
       - publish-openstack-docs-pti
     check:
       jobs:
-        - cloudkittyclient-devstack-functional:
+        - cloudkittyclient-devstack-functional-v1-client:
             voting: true
-        - cloudkittyclient-devstack-functional-py3:
+        - cloudkittyclient-devstack-functional-v2-client:
+            voting: true
+        - cloudkittyclient-devstack-functional-v1-client-py3:
+            voting: true
+        - cloudkittyclient-devstack-functional-v2-client-py3:
             voting: true
     gate:
       jobs:
-        - cloudkittyclient-devstack-functional:
+        - cloudkittyclient-devstack-functional-v1-client:
             voting: true
-        - cloudkittyclient-devstack-functional-py3:
+        - cloudkittyclient-devstack-functional-v2-client:
+            voting: true
+        - cloudkittyclient-devstack-functional-v1-client-py3:
+            voting: true
+        - cloudkittyclient-devstack-functional-v2-client-py3:
             voting: true
diff --git a/tox.ini b/tox.ini
index 5bb36bb..150aa88 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,9 +28,15 @@ commands =
 basepython = python3
 commands = oslo_debug_helper -t cloudkittyclient/tests {posargs}
 
-[testenv:functional]
-passenv = OS_CLOUD OS_PROJECT_DOMAIN_ID OS_USER_DOMAIN_ID OS_PROJECT_DOMAIN_NAME OS_USER_DOMAIN_NAME OS_PROJECT_NAME OS_IDENTITY_API_VERSION OS_PASSWORD OS_AUTH_TYPE OS_AUTH_URL OS_USERNAME
-commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional
+[testenv:functional-v1]
+passenv = OS_CLOUD OS_PROJECT_DOMAIN_ID OS_USER_DOMAIN_ID OS_PROJECT_DOMAIN_NAME OS_USER_DOMAIN_NAME OS_PROJECT_NAME OS_IDENTITY_API_VERSION OS_PASSWORD OS_AUTH_TYPE OS_AUTH_URL OS_USERNAME OS_ENDPOINT
+setenv = OS_RATING_API_VERSION=1
+commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v1
+
+[testenv:functional-v2]
+passenv = OS_CLOUD OS_PROJECT_DOMAIN_ID OS_USER_DOMAIN_ID OS_PROJECT_DOMAIN_NAME OS_USER_DOMAIN_NAME OS_PROJECT_NAME OS_IDENTITY_API_VERSION OS_PASSWORD OS_AUTH_TYPE OS_AUTH_URL OS_USERNAME OS_ENDPOINT
+setenv = OS_RATING_API_VERSION=2
+commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2
 
 [testenv:pep8]
 basepython = python3