update initial crucible-ci run-file JSONs to match the newest additions

perftool-incubator · Apr 24, 2024 · 6c18b6e · 6c18b6e
1 parent f9f2f3f
commit 6c18b6e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 43 deletions.
diff --git a/util/crucible-ci/cyclictest.remotehost.json b/util/crucible-ci/cyclictest.remotehost.json
@@ -5,45 +5,40 @@
             "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"
                     }
                 ]
             }
         }
     ],
     "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": [
         {
             "type": "remotehost",
             "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
@@ -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,26 +33,21 @@
     ],
     "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": [
         {
             "type": "remotehost",
             "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
@@ -55,26 +55,21 @@
     ],
     "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": [
         {
             "type": "remotehost",
             "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
@@ -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,28 +23,21 @@
     ],
     "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": [
         {
             "type": "k8s",
             "controller-ip": "CONTROLLER_IP",
             "host": "CI_ENDPOINT_HOST",
             "user": "CI_ENDPOINT_USER",
-            "userenv": "alma8",
-            "unique-project": 1,
-            "kubeconfig": 0,
             "server": 1,
             "client": 1,
             "config": [