diff --git a/util/crucible-ci/cyclictest.remotehost.json b/util/crucible-ci/cyclictest.remotehost.json index d26777a1..3974697a 100644 --- a/util/crucible-ci/cyclictest.remotehost.json +++ b/util/crucible-ci/cyclictest.remotehost.json @@ -5,18 +5,18 @@ "ids": "1", "mv-params": { "global-options": [ - { - "name": "required", - "params": [ + { + "name": "required", + "params": [ { "arg": "duration", "vals": [ "10" ], "role": "client" }, - { "arg": "priority", "vals": [ "1" ], "role": "client" }, + { "arg": "priority", "vals": [ "1", "2" ], "role": "client" }, { "arg": "smi", "vals": [ "off" ], "role": "client" } - ] - } + ] + } ], "sets": [ - { - "include": "required" + { + "include": "required" } ] } @@ -24,18 +24,14 @@ ], "tool-params": [ { - "tool": "sysstat", - "params": [ - { "arg": "subtools", "val": "mpstat", "enabled": "yes" } - ] + "tool": "sysstat" }, { "tool": "procstat" } ], "tags": { - "run": "cyclictest-run-file-json", - "userenv": "default" + "description": "cyclictest-remotehost-run-file-json" }, "endpoints": [ { @@ -43,7 +39,6 @@ "controller-ip": "CONTROLLER_IP", "host": "CI_ENDPOINT_HOST", "user": "CI_ENDPOINT_USER", - "userenv": "default", "server": "1", "client": "1-2", "config": [ @@ -77,7 +72,6 @@ "controller-ip": "CONTROLLER_IP", "host": "CI_ENDPOINT_HOST", "user": "CI_ENDPOINT_USER", - "userenv": "default", "profiler": "1", "config": [ { diff --git a/util/crucible-ci/fio.remotehost.json b/util/crucible-ci/fio.remotehost.json index 5c1ec6ce..2dc223b7 100644 --- a/util/crucible-ci/fio.remotehost.json +++ b/util/crucible-ci/fio.remotehost.json @@ -11,7 +11,7 @@ { "arg": "clocksource", "vals": [ "gettimeofday" ] }, { "arg": "ramp_time", "vals": [ "5s" ] }, - { "arg": "bs", "vals": [ "4K" ] }, + { "arg": "bs", "vals": [ "4K", "512K" ] }, { "arg": "unlink", "vals": [ "1" ] }, { "arg": "filename", "vals": [ "/tmp/fio.foo" ] }, { "arg": "runtime", "vals": [ "10s" ] }, @@ -33,18 +33,14 @@ ], "tool-params": [ { - "tool": "sysstat", - "params": [ - { "arg": "subtools", "val": "mpstat", "enabled": "yes" } - ] + "tool": "sysstat" }, { "tool": "procstat" } ], "tags": { - "run": "fio-run-file-json", - "userenv": "default" + "description": "fio-remotehost-run-file-json" }, "endpoints": [ { @@ -52,7 +48,6 @@ "controller-ip": "CONTROLLER_IP", "host": "CI_ENDPOINT_HOST", "user": "CI_ENDPOINT_USER", - "userenv": "default", "client": "1-2", "config": [ { @@ -78,7 +73,6 @@ "controller-ip": "CONTROLLER_IP", "host": "CI_ENDPOINT_HOST", "user": "CI_ENDPOINT_USER", - "userenv": "default", "profiler": "1", "config": [ { diff --git a/util/crucible-ci/multi.remotehost.json b/util/crucible-ci/multi.remotehost.json index 7ef021b8..ffa935d8 100644 --- a/util/crucible-ci/multi.remotehost.json +++ b/util/crucible-ci/multi.remotehost.json @@ -55,18 +55,14 @@ ], "tool-params": [ { - "tool": "sysstat", - "params": [ - { "arg": "subtools", "val": "mpstat", "enabled": "yes" } - ] + "tool": "sysstat" }, { "tool": "procstat" } ], "tags": { - "run": "multibench-run-file-json", - "userenv": "default" + "description": "mulitbench-remotehost-run-file-json" }, "endpoints": [ { @@ -74,7 +70,6 @@ "controller-ip": "CONTROLLER_IP", "host": "CI_ENDPOINT_HOST", "user": "CI_ENDPOINT_USER", - "userenv": "default", "server": "1-2", "client": "1-2", "config": [ @@ -103,7 +98,6 @@ "controller-ip": "CONTROLLER_IP", "host": "CI_ENDPOINT_HOST", "user": "CI_ENDPOINT_USER", - "userenv": "default", "profiler": "1", "config": [ { diff --git a/util/crucible-ci/oslat.k8s.json b/util/crucible-ci/oslat.k8s.json index 36e9b815..9205c25d 100644 --- a/util/crucible-ci/oslat.k8s.json +++ b/util/crucible-ci/oslat.k8s.json @@ -9,7 +9,7 @@ "name": "common-params", "params": [ { "arg": "duration", "vals": [ "10" ], "role": "client" }, - { "arg": "rtprio", "vals": [ "1" ], "role": "client" } + { "arg": "rtprio", "vals": [ "1", "2" ], "role": "client" } ] } ], @@ -23,18 +23,14 @@ ], "tool-params": [ { - "tool": "sysstat", - "params": [ - { "arg": "subtools", "val": "mpstat", "enabled": "yes" } - ] + "tool": "sysstat" }, { "tool": "procstat" } ], "tags": { - "run": "single-json-all-in-one", - "userenv": "alma8" + "description": "oslat-k8s-run-file-json" }, "endpoints": [ { @@ -42,9 +38,6 @@ "controller-ip": "CONTROLLER_IP", "host": "CI_ENDPOINT_HOST", "user": "CI_ENDPOINT_USER", - "userenv": "alma8", - "unique-project": 1, - "kubeconfig": 0, "server": 1, "client": 1, "config": [