From c683c70d8aadea2dab7165955f5965b884501a0c Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <henrywangxf@me.com>
Date: Tue, 24 Aug 2021 09:54:35 +0800
Subject: [PATCH] test: Update ostree-ng.sh to cover bug BZ#1951087

Update the first blueprint to use "normal" kernel instead of to
use "rt" kernel. Then upgrade to "rt" kernel.

To work with this bug fix, we need osbuild fix and have to pin to
osbuild latest commit.

The customizations.user is removed from upgrade blueprint to work
with this bug fix. But it's for RHEL 8.5 only.
---
 Schutzfile              |  2 +-
 test/cases/ostree-ng.sh | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Schutzfile b/Schutzfile
index 54b84754c..7e98040bd 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -43,7 +43,7 @@
   "rhel-8.5": {
     "dependencies": {
       "osbuild": {
-        "commit": "35de3093a7b52569512bdc61d2105febbb9b0c7e"
+        "commit": "ca3941feb67202f7165c7dde0ff12fae5601f0cf"
       }
     }
   },
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index b96085ecc..b8f7fe4bc 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -99,18 +99,21 @@ case "${ID}-${VERSION_ID}" in
         CONTAINER_FILENAME=rhel84-container.tar
         INSTALLER_TYPE=rhel-edge-installer
         INSTALLER_FILENAME=rhel84-boot.iso
+        USER_IN_UPGRADE_BP="true"
         ;;
     "rhel-8.5")
         CONTAINER_TYPE=edge-container
         CONTAINER_FILENAME=container.tar
         INSTALLER_TYPE=edge-installer
         INSTALLER_FILENAME=installer.iso
+        USER_IN_UPGRADE_BP="false"
         ;;
     "rhel-9.0")
         CONTAINER_TYPE=edge-container
         CONTAINER_FILENAME=container.tar
         INSTALLER_TYPE=edge-installer
         INSTALLER_FILENAME=installer.iso
+        USER_IN_UPGRADE_BP="true"
         ;;
     *)
         echo "unsupported distro: ${ID}-${VERSION_ID}"
@@ -291,9 +294,6 @@ groups = []
 name = "python36"
 version = "*"
 
-[customizations.kernel]
-name = "kernel-rt"
-
 [[customizations.user]]
 name = "admin"
 description = "Administrator account"
@@ -579,11 +579,16 @@ name = "kernel-rt"
 name = "admin"
 description = "Administrator account"
 password = "\$6\$GRmb7S0p8vsYmXzH\$o0E020S.9JQGaHkszoog4ha4AQVs3sk8q0DvLjSMxoxHBKnB2FBXGQ/OkwZQfW/76ktHd0NX5nls2LPxPuUdl."
-key = "${SSH_KEY_PUB}"
 home = "/home/admin/"
 groups = ["wheel"]
 EOF
 
+if [[ "${USER_IN_UPGRADE_BP}" == "true" ]]; then
+    tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
+key = "${SSH_KEY_PUB}"
+EOF
+fi
+
 greenprint "📄 upgrade blueprint"
 cat "$BLUEPRINT_FILE"