summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Harbott <j.harbott@x-ion.de>2018-11-28 10:37:55 +0000
committerJens Harbott <j.harbott@x-ion.de>2018-11-28 14:45:14 +0000
commit7d765bf21ca77c4d085b7dcdcd91cdf168f667a2 (patch)
treef609315e7d487651f97de6a026712a7b5e9adaa9
parent05d035588bf2d365e050cdfc37db41c18aa7fafa (diff)
downloadpython-keystoneclient-7d765bf21ca77c4d085b7dcdcd91cdf168f667a2.tar.gz
Fix keystoneclient-devstack-functional job
The keystoneclient-devstack-functional job works fine when being run against this repo, but fails when running against the keystone repo because of conflicts within the tools/test-setup.sh script there. Do our own definition of the job to make sure that we always run tox against the correct repo. Also base the job on devstack-minimal to avoid installing more serviced than needed. Change-Id: Ie4c03de48a3b7f2fb3967a185486c6fb0d6e0a5f
-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