Merge "Fix tox job for stress tests."
diff --git a/tempest/stress/etc/stress-tox-job.json b/tempest/stress/etc/stress-tox-job.json
new file mode 100644
index 0000000..7c5626d
--- /dev/null
+++ b/tempest/stress/etc/stress-tox-job.json
@@ -0,0 +1,13 @@
+[{"action": "tempest.stress.actions.create_destroy_server.create_destroy",
+ "threads": 8,
+ "use_admin": false,
+ "use_isolated_tenants": false,
+ "kwargs": {}
+ },
+ {"action": "tempest.stress.actions.volume_create_delete.create_delete",
+ "threads": 4,
+ "use_admin": false,
+ "use_isolated_tenants": false,
+ "kwargs": {}
+ }
+]
diff --git a/tox.ini b/tox.ini
index 964dbca..ae1b11e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,9 +65,7 @@
sitepackages = True
setenv = VIRTUAL_ENV={envdir}
commands =
- python -m tempest/stress/run_stress tempest/stress/etc/sample-test.json -d 60
- python -m tempest/stress/run_stress tempest/stress/etc/volume-create-delete-test.json -d 60
-
+ python -m tempest/stress/run_stress tempest/stress/etc/stress-tox-job.json -d 3600
[testenv:venv]
commands = {posargs}