summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--playbooks/zuul-tox/post-system-logs.yaml3
-rw-r--r--playbooks/zuul-tox/pre.yaml2
-rw-r--r--tox.ini2
3 files changed, 5 insertions, 2 deletions
diff --git a/playbooks/zuul-tox/post-system-logs.yaml b/playbooks/zuul-tox/post-system-logs.yaml
index 7a9da4821..437411914 100644
--- a/playbooks/zuul-tox/post-system-logs.yaml
+++ b/playbooks/zuul-tox/post-system-logs.yaml
@@ -1,5 +1,6 @@
- hosts: all
+ roles:
+ - dstat-graph
tasks:
-
- name: Collect zookeeper logs
shell: "cp /opt/zookeeper/logs/* {{ zuul_output_dir }}/logs/"
diff --git a/playbooks/zuul-tox/pre.yaml b/playbooks/zuul-tox/pre.yaml
index 45d213e97..c8c1c6500 100644
--- a/playbooks/zuul-tox/pre.yaml
+++ b/playbooks/zuul-tox/pre.yaml
@@ -1,4 +1,6 @@
- hosts: all
roles:
+ - ensure-dstat-graph
+ - run-dstat
- role: ensure-zookeeper
zookeeper_use_tls: true
diff --git a/tox.ini b/tox.ini
index 889017fb3..6c0e01db6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,7 +41,7 @@ deps =
docker =
docker: zookeeper:3.4
commands =
- bash -c 'stestr run --slowest --concurrency=`python -c "import multiprocessing; print(int(multiprocessing.cpu_count()/2))"` {posargs}'
+ bash -c 'stestr run --slowest {posargs}'
[testenv:bindep]
# Do not install any requirements. We want this to be fast and work even if