From 95dcb92d79d2f46259cdf8ea824141e289a14ac3 Mon Sep 17 00:00:00 2001
From: Karl Rister <krister@redhat.com>
Date: Wed, 1 May 2024 09:03:19 -0500
Subject: [PATCH] bugfix: properly update the multibench remotehosts template

- it was initially cloned from the remotehost endpoint template (like
  the reset of the remotehosts templates) but this one fell through
  the cracks and was not updated
---
 util/crucible-ci/multi.remotehosts.json | 78 +++++++++++--------------
 1 file changed, 33 insertions(+), 45 deletions(-)

diff --git a/util/crucible-ci/multi.remotehosts.json b/util/crucible-ci/multi.remotehosts.json
index be57a272..624eb842 100644
--- a/util/crucible-ci/multi.remotehosts.json
+++ b/util/crucible-ci/multi.remotehosts.json
@@ -65,51 +65,39 @@
         "description": "mulitbench-remotehosts-run-file-json"
     },
     "endpoints": [
-        {
-            "type": "remotehost",
-            "controller-ip": "CONTROLLER_IP",
-            "host": "CI_ENDPOINT_HOST",
-            "user": "CI_ENDPOINT_USER",
-            "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",
-            "profiler": "1",
-            "config": [
-                {
-                    "targets": [
-                        { "role": "profiler", "ids": "1" }
-                    ],
-                    "settings": {
-                        "osruntime": "chroot"
-                    }
-                }
-            ]
-        }
+	{
+	    "type": "remotehosts",
+	    "settings": {
+		"user": "CI_ENDPOINT_USER",
+		"controller-ip-address": "CONTROLLER_IP"
+	    },
+	    "remotes": [
+		{
+		    "engines": [
+			{ "role": "client", "ids": [ 1 ] },
+			{ "role": "server", "ids": [ 1 ] }
+		    ],
+		    "config": {
+			"host": "CI_ENDPOINT_HOST",
+			"settings": {
+			    "osruntime": "podman"
+			}
+		    }
+		},
+		{
+		    "engines": [
+			{ "role": "client", "ids": [ 2 ] },
+			{ "role": "server", "ids": [ 2 ] }
+		    ],
+		    "config": {
+			"host": "CI_ENDPOINT_HOST",
+			"settings": {
+			    "osruntime": "chroot"
+			}
+		    }
+		}
+	    ]
+	}
     ],
     "run-params": {
 	    "num-samples": 1,