summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-30 00:56:30 +0000
committerGerrit Code Review <review@openstack.org>2018-11-30 00:56:30 +0000
commitfee326e56a053592293ef724c7dd31dfa69acf5f (patch)
treebcbd24b618a89c5df87b8de1b45bf6219c6bac5a
parentf96d92dae348ec23d6f6196d4bf7c804e56f5f66 (diff)
parent7d765bf21ca77c4d085b7dcdcd91cdf168f667a2 (diff)
downloadpython-keystoneclient-fee326e56a053592293ef724c7dd31dfa69acf5f.tar.gz
Merge "Fix keystoneclient-devstack-functional job"
-rw-r--r--.zuul.yaml9
-rw-r--r--playbooks/run-ds-tox.yaml5
-rw-r--r--playbooks/tox-post.yaml4
3 files changed, 16 insertions, 2 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index dc34dbb..4845e48 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,14 +1,19 @@
- job:
name: keystoneclient-devstack-functional
- parent: devstack-tox-functional-consumer
+ parent: devstack-minimal
timeout: 4200
required-projects:
- openstack/keystone
- openstack/python-keystoneclient
+ run: playbooks/run-ds-tox.yaml
+ post-run: playbooks/tox-post.yaml
vars:
- tox_envlist: functional
devstack_localrc:
USE_PYTHON3: True
+ devstack_services:
+ key: true
+ tox_envlist: functional
+ zuul_work_dir: src/git.openstack.org/openstack/python-keystoneclient
- project:
templates:
diff --git a/playbooks/run-ds-tox.yaml b/playbooks/run-ds-tox.yaml
new file mode 100644
index 0000000..b414b74
--- /dev/null
+++ b/playbooks/run-ds-tox.yaml
@@ -0,0 +1,5 @@
+- hosts: all
+ roles:
+ - run-devstack
+ - ensure-tox
+ - tox
diff --git a/playbooks/tox-post.yaml b/playbooks/tox-post.yaml
new file mode 100644
index 0000000..7f0cb19
--- /dev/null
+++ b/playbooks/tox-post.yaml
@@ -0,0 +1,4 @@
+- hosts: all
+ roles:
+ - fetch-tox-output
+ - fetch-subunit-output