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

test/cases: add support for RHEL 8.6 to test scripts

Browse source 
Signed-off-by: Achilleas Koutsou <achilleas@koutsou.net>
This commit is contained in:
Achilleas Koutsou 2021-10-06 11:49:23 +02:00 • committed by Ondřej Budai
parent 97f9d02d92
commit be16a6e502
5 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/cases/api.sh
View file

@ -401,6 +401,14 @@ case "$ID-$VERSION_ID" in
SSH_USER="cloud-user" SSH_USER="cloud-user"
fi fi
;; ;;
"rhel-8.6")
DISTRO="rhel-86"
if [[ "$CLOUD_PROVIDER" == "$CLOUD_PROVIDER_AWS" ]]; then
SSH_USER="ec2-user"
else
SSH_USER="cloud-user"
fi
;;
"rhel-8.5") "rhel-8.5")
DISTRO="rhel-85" DISTRO="rhel-85"
if [[ "$CLOUD_PROVIDER" == "$CLOUD_PROVIDER_AWS" ]]; then if [[ "$CLOUD_PROVIDER" == "$CLOUD_PROVIDER_AWS" ]]; then

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

@ -101,7 +101,7 @@ case "${ID}-${VERSION_ID}" in
USER_IN_UPGRADE_BP="true" USER_IN_UPGRADE_BP="true"
INSTALLER_PATH="/ostree/repo" INSTALLER_PATH="/ostree/repo"
;; ;;
"rhel-8.5") "rhel-8.5" | "rhel-8.6")
CONTAINER_TYPE=edge-container CONTAINER_TYPE=edge-container
CONTAINER_FILENAME=container.tar CONTAINER_FILENAME=container.tar
INSTALLER_TYPE=edge-installer INSTALLER_TYPE=edge-installer

8
test/cases/ostree-raw-image.sh
View file

@ -85,13 +85,7 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
case "${ID}-${VERSION_ID}" in case "${ID}-${VERSION_ID}" in
"rhel-8.5") "rhel-8.5" | "rhel-8.6" | "rhel-9.0")
CONTAINER_TYPE=edge-container
CONTAINER_FILENAME=container.tar
INSTALLER_TYPE=edge-raw-image
INSTALLER_FILENAME=image.raw.xz
;;
"rhel-9.0")
CONTAINER_TYPE=edge-container CONTAINER_TYPE=edge-container
CONTAINER_FILENAME=container.tar CONTAINER_FILENAME=container.tar
INSTALLER_TYPE=edge-raw-image INSTALLER_TYPE=edge-raw-image

8
test/cases/ostree-simplified-installer.sh
View file

@ -94,13 +94,7 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
case "${ID}-${VERSION_ID}" in case "${ID}-${VERSION_ID}" in
"rhel-8.5") "rhel-8.5" | "rhel-8.6" | "rhel-9.0")
CONTAINER_TYPE=edge-container
CONTAINER_FILENAME=container.tar
INSTALLER_TYPE=edge-simplified-installer
INSTALLER_FILENAME=simplified-installer.iso
;;
"rhel-9.0")
CONTAINER_TYPE=edge-container CONTAINER_TYPE=edge-container
CONTAINER_FILENAME=container.tar CONTAINER_FILENAME=container.tar
INSTALLER_TYPE=edge-simplified-installer INSTALLER_TYPE=edge-simplified-installer

2
test/cases/ostree.sh
View file

@ -29,7 +29,7 @@ case "${ID}-${VERSION_ID}" in
OS_VARIANT="rhel8.4" OS_VARIANT="rhel8.4"
USER_IN_COMMIT="false" USER_IN_COMMIT="false"
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.4.0/BaseOS/x86_64/os/";; BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.4.0/BaseOS/x86_64/os/";;
"rhel-8.5") "rhel-8.5" | "rhel-8.6")
IMAGE_TYPE=edge-commit IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/8/${ARCH}/edge" OSTREE_REF="rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown" OS_VARIANT="rhel8-unknown"