From be03947fe596a4d7eb9cb8694bde53c017fa7332 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Fri, 13 Mar 2020 20:59:19 +0100
Subject: [PATCH] test/cases/tar: fix up the f30-x86_64-tar-boot test case

This had not been regenrated like the other ones, insert the right
blueprint and regenerate it.

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 test/cases/f30-x86_64-tar-boot.json | 80 +++++++++++------------------
 1 file changed, 29 insertions(+), 51 deletions(-)

diff --git a/test/cases/f30-x86_64-tar-boot.json b/test/cases/f30-x86_64-tar-boot.json
index 846c641dd..0d5b0eb1d 100644
--- a/test/cases/f30-x86_64-tar-boot.json
+++ b/test/cases/f30-x86_64-tar-boot.json
@@ -7,41 +7,27 @@
     "distro": "fedora-30",
     "arch": "x86_64",
     "filename": "root.tar.xz",
-    "blueprint-draft": {
+    "blueprint": {
       "name": "tar-boot-test",
       "description": "Image for boot test",
-      "packages": [],
+      "packages": [
+        {
+          "name": "openssh-server",
+          "version": "*"
+        }
+      ],
       "modules": [],
       "groups": [],
       "customizations": {
         "user": [
           {
             "name": "redhat",
-            "password": "$y$j9T$hMKTMCO/s27TcOMRH9eUN1$6G0Jrc20QiptW6P3fwm3LKDd/4IIVSr1N2u611UwNgB",
-            "groups": [
-              "wheel"
-            ]
-          }
-        ],
-        "sshkey": [
-          {
-            "user": "redhat",
             "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
           }
         ]
-      },
-      "services": {
-        "enabled": [
-          "sshd"
-        ]
       }
     }
   },
-  "rpmmd": {
-    "checksums": {
-      "fedora": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
-    }
-  },
   "manifest": {
     "sources": {},
     "pipeline": {
@@ -105,12 +91,26 @@
             "module_platform_id": "platform:f30"
           }
         },
+        {
+          "name": "org.osbuild.fix-bls",
+          "options": {}
+        },
         {
           "name": "org.osbuild.locale",
           "options": {
             "language": "en_US"
           }
         },
+        {
+          "name": "org.osbuild.users",
+          "options": {
+            "users": {
+              "redhat": {
+                "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
+              }
+            }
+          }
+        },
         {
           "name": "org.osbuild.grub2",
           "options": {
@@ -119,48 +119,26 @@
             "legacy": true
           }
         },
-        {
-          "name": "org.osbuild.systemd",
-          "options": {
-            "enabled_services": [
-              "sshd"
-            ],
-            "disabled_services": [
-              "auditd"
-            ]
-          }
-        },
-        {
-          "name": "org.osbuild.users",
-          "options": {
-            "users": {
-              "redhat": {
-                "groups": [
-                  "wheel"
-                ],
-                "password": "$6$IR7O7z56ouB/OInP$.hscD6dQqPQGwMuQ.idumixSHI/JEyaUfiCAHVSpGO/iNLEvvVZVOQL23zBzQbc2.yJ25xAZD75H0tXqKJpEE/",
-                "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
-              }
-            }
-          }
-        },
         {
           "name": "org.osbuild.selinux",
           "options": {
             "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
           }
-        },
-        {
-          "name": "org.osbuild.fix-bls",
-          "options": {}
         }
       ],
       "assembler": {
         "name": "org.osbuild.tar",
         "options": {
-          "filename": "root.tar.xz"
+          "filename": "root.tar.xz",
+          "size": 0,
+          "compression": "xz"
         }
       }
     }
+  },
+  "rpmmd": {
+    "checksums": {
+      "fedora": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
+    }
   }
 }