test: update test configs

Move sshkey in test configs to users. This has no effect on generated manifests.
osbuild · Sep 13, 2024 · 2d9ca58 · 2d9ca58
1 parent cb5a9ae
commit 2d9ca58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/test/configs/all-customizations.json b/test/configs/all-customizations.json
@@ -22,13 +22,11 @@
       "kernel": {
         "append": "debug"
       },
-      "sshkey": [
+      "user": [
         {
-          "user": "user1",
+          "name": "user1",
           "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
-        }
-      ],
-      "user": [
+        },
         {
           "name": "user2",
           "description": "description 2",

diff --git a/test/configs/all-with-fips.json b/test/configs/all-with-fips.json
@@ -23,13 +23,11 @@
         "append": "debug"
       },
       "fips": true,
-      "sshkey": [
+      "user": [
         {
-          "user": "user1",
+          "name": "user1",
           "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
-        }
-      ],
-      "user": [
+        },
         {
           "name": "user2",
           "description": "description 2",

diff --git a/test/configs/oscap-generic.json b/test/configs/oscap-generic.json
@@ -22,13 +22,11 @@
       "kernel": {
         "append": "debug"
       },
-      "sshkey": [
+      "user": [
         {
-          "user": "user1",
+          "name": "user1",
           "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
-        }
-      ],
-      "user": [
+        },
         {
           "name": "user2",
           "description": "description 2",