diff --git a/util/JSON/schema-remotehost.json b/util/JSON/schema-remotehost.json index 4059a4e4..571adc80 100644 --- a/util/JSON/schema-remotehost.json +++ b/util/JSON/schema-remotehost.json @@ -5,6 +5,9 @@ "type": "string", "enum": [ "remotehost" ] }, + "controller-ip": { + "type": "string" + }, "host": { "type": "string" }, @@ -14,9 +17,6 @@ "userenv": { "type": "string" }, - "unique-project": { - "type": "integer" - }, "client": { "anyOf": [ { @@ -39,6 +39,17 @@ } ] }, + "profiler": { + "anyOf": [ + { + "type": "string", + "pattern": "^(?!0$)(([1-9]|10)(-[1-9][0-9]*)?)(\\+(([1-9]|10)(-[1-9][0-9]*)?))*$" + }, + { + "type": "integer" + } + ] + }, "config": { "type": "array", "minItems": 1, @@ -55,7 +66,7 @@ "properties": { "role": { "type": "string", - "enum": [ "client", "server" ] + "enum": [ "client", "server", "profiler" ] }, "ids": { "type": "string", diff --git a/util/tests/JSON/ci-multi-run-file-remotehost-default.json b/util/tests/JSON/ci-multi-run-file-remotehost-default.json new file mode 100644 index 00000000..2088550b --- /dev/null +++ b/util/tests/JSON/ci-multi-run-file-remotehost-default.json @@ -0,0 +1,124 @@ +{ + "benchmarks": [ + { + "name": "iperf", + "ids": "1", + "mv-params": { + "global-options": [ + { + "name": "required", + "params": [ + { "arg": "time", "vals": [ "10" ], "role": "client" }, + { "arg": "protocol", "vals": [ "tcp" ] }, + { "arg": "bitrate", "vals": [ "0" ] }, + { "arg": "ifname", "vals" : [ "default-route" ], "role": "server" } + ] + } + ], + "sets": [ + { + "include": "required", + "params": [ + { "arg": "length", "vals": [ "256", "1024" ] } + ] + } + ] + } + }, + { + "name": "uperf", + "ids": "2", + "mv-params": { + "global-options": [ + { + "name": "required", + "params": [ + { "arg": "protocol", "vals": [ "tcp" ], "role": "client" }, + { "arg": "wsize", "vals": [ "64" ], "role": "client" }, + { "arg": "rsize", "vals": [ "64" ], "role": "client" }, + { "arg": "duration", "vals": [ "10" ], "role": "client" }, + { "arg": "ifname", "vals" : [ "default-route" ], "role": "server" } + ] + } + ], + "sets": [ + { + "include": "required", + "params": [ + { "arg": "test-type", "vals": [ "stream" ], "role": "client" }, + { "arg": "nthreads", "vals": [ "1", "8" ], "role": "client" } + ] + } + ] + } + } + ], + "tool-params": [ + { + "tool": "sysstat", + "params": [ + { "arg": "subtools", "val": "mpstat", "enabled": "yes" } + ] + }, + { + "tool": "procstat" + } + ], + "tags": { + "run": "multibench-run-file-json", + "userenv": "default" + }, + "endpoints": [ + { + "type": "remotehost", + "controller-ip": "CONTROLLER_IP", + "host": "CI_ENDPOINT_HOST", + "user": "CI_ENDPOINT_USER", + "userenv": "default", + "server": "1-2", + "client": "1-2", + "config": [ + { + "targets": [ + { "role": "client", "ids": "1" }, + { "role": "server", "ids": "1" } + ], + "settings": { + "osruntime": "podman" + } + }, + { + "targets": [ + { "role": "client", "ids": "2" }, + { "role": "server", "ids": "2" } + ], + "settings": { + "osruntime": "chroot" + } + } + ] + }, + { + "type": "remotehost", + "controller-ip": "CONTROLLER_IP", + "host": "CI_ENDPOINT_HOST", + "user": "CI_ENDPOINT_USER", + "userenv": "default", + "profiler": "1", + "config": [ + { + "targets": [ + { "role": "profiler", "ids": "1" } + ], + "settings": { + "osruntime": "chroot" + } + } + ] + } + ], + "run-params": { + "num-samples": "1", + "test-order": "s" + } +}