particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: Update ostree-ng.sh to cover bug BZ#1951087

Browse source 
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.
This commit is contained in:
Xiaofeng Wang 2021-08-24 09:54:35 +08:00 • committed by Tom Gundersen
parent df30073d65
commit c683c70d8a
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/cases/ostree-ng.sh
View file

@ -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"