Skip to content

Commit dd4112a

Browse files
committed
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
1 parent 3010383 commit dd4112a

2 files changed

Lines changed: 48 additions & 11 deletions

File tree

.zuul.yaml

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- job:
2-
name: cloudkittyclient-devstack-functional
2+
name: cloudkittyclient-devstack-functional-base
33
parent: devstack
44
description: |
55
Job for cloudkittyclient functional tests
@@ -26,18 +26,41 @@
2626
horizon: false
2727
tox_install_siblings: false
2828
zuul_work_dir: src/opendev.org/openstack/python-cloudkittyclient
29-
tox_envlist: functional
3029

3130
- job:
32-
name: cloudkittyclient-devstack-functional-py3
33-
parent: cloudkittyclient-devstack-functional
31+
name: cloudkittyclient-devstack-functional-v1-client
32+
parent: cloudkittyclient-devstack-functional-base
33+
vars:
34+
tox_envlist: functional-v1
35+
36+
- job:
37+
name: cloudkittyclient-devstack-functional-v2-client
38+
parent: cloudkittyclient-devstack-functional-base
39+
vars:
40+
tox_envlist: functional-v2
41+
42+
- job:
43+
name: cloudkittyclient-devstack-functional-base-py3
44+
parent: cloudkittyclient-devstack-functional-base
3445
description: |
3546
Job for cloudkittyclient functional tests, ran in python3.
3647
vars:
3748
devstack_localrc:
3849
DEVSTACK_GATE_USE_PYTHON3: "True"
3950
USE_PYTHON3: "True"
4051

52+
- job:
53+
name: cloudkittyclient-devstack-functional-v1-client-py3
54+
parent: cloudkittyclient-devstack-functional-base-py3
55+
vars:
56+
tox_envlist: functional-v1
57+
58+
- job:
59+
name: cloudkittyclient-devstack-functional-v2-client-py3
60+
parent: cloudkittyclient-devstack-functional-base-py3
61+
vars:
62+
tox_envlist: functional-v2
63+
4164
- project:
4265
templates:
4366
- openstack-lower-constraints-jobs
@@ -49,13 +72,21 @@
4972
- publish-openstack-docs-pti
5073
check:
5174
jobs:
52-
- cloudkittyclient-devstack-functional:
75+
- cloudkittyclient-devstack-functional-v1-client:
5376
voting: true
54-
- cloudkittyclient-devstack-functional-py3:
77+
- cloudkittyclient-devstack-functional-v2-client:
78+
voting: true
79+
- cloudkittyclient-devstack-functional-v1-client-py3:
80+
voting: true
81+
- cloudkittyclient-devstack-functional-v2-client-py3:
5582
voting: true
5683
gate:
5784
jobs:
58-
- cloudkittyclient-devstack-functional:
85+
- cloudkittyclient-devstack-functional-v1-client:
86+
voting: true
87+
- cloudkittyclient-devstack-functional-v2-client:
88+
voting: true
89+
- cloudkittyclient-devstack-functional-v1-client-py3:
5990
voting: true
60-
- cloudkittyclient-devstack-functional-py3:
91+
- cloudkittyclient-devstack-functional-v2-client-py3:
6192
voting: true

tox.ini

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,15 @@ commands =
2828
basepython = python3
2929
commands = oslo_debug_helper -t cloudkittyclient/tests {posargs}
3030

31-
[testenv:functional]
32-
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
33-
commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional
31+
[testenv:functional-v1]
32+
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
33+
setenv = OS_RATING_API_VERSION=1
34+
commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v1
35+
36+
[testenv:functional-v2]
37+
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
38+
setenv = OS_RATING_API_VERSION=2
39+
commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2
3440

3541
[testenv:pep8]
3642
basepython = python3

0 commit comments

Comments
 (0)