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

test/ostree-simplified: variable string fixes

Browse source 
- All variants use the same image type names
- OSTREE_REF differs for each case
- Use OS_VARIANT in virt-install command
This commit is contained in:
Achilleas Koutsou 2021-11-08 11:36:24 +01:00 • committed by Ondřej Budai
parent fa18ba0431
commit 90219720d4
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,8 +77,6 @@ polkit.addRule(function(action, subject) {
EOF EOF
# Set up variables. # Set up variables.
OSTREE_REF="rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
TEST_UUID=$(uuidgen) TEST_UUID=$(uuidgen)
IMAGE_KEY="edge-${TEST_UUID}" IMAGE_KEY="edge-${TEST_UUID}"
HTTP_GUEST_ADDRESS=192.168.100.50 HTTP_GUEST_ADDRESS=192.168.100.50
@ -88,6 +86,10 @@ PROD_REPO=/var/www/html/repo
STAGE_REPO_ADDRESS=192.168.200.1 STAGE_REPO_ADDRESS=192.168.200.1
STAGE_REPO_URL="http://${STAGE_REPO_ADDRESS}:8080/repo/" STAGE_REPO_URL="http://${STAGE_REPO_ADDRESS}:8080/repo/"
ARTIFACTS="ci-artifacts" ARTIFACTS="ci-artifacts"
CONTAINER_TYPE=edge-container
CONTAINER_FILENAME=container.tar
INSTALLER_TYPE=edge-simplified-installer
INSTALLER_FILENAME=simplified-installer.iso
mkdir -p "${ARTIFACTS}" mkdir -p "${ARTIFACTS}"
# Set up temporary files. # Set up temporary files.
@ -103,11 +105,21 @@ 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.6" | "centos-8" | "rhel-9.0" | "centos-9") "rhel-8.6")
CONTAINER_TYPE=edge-container OSTREE_REF="rhel/8/${ARCH}/edge"
CONTAINER_FILENAME=container.tar OS_VARIANT="rhel8-unknown"
INSTALLER_TYPE=edge-simplified-installer ;;
INSTALLER_FILENAME=simplified-installer.iso "centos-8")
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
;;
"rhel-9.0")
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
;;
"centos-9")
OSTREE_REF="centos/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
;; ;;
*) *)
echo "unsupported distro: ${ID}-${VERSION_ID}" echo "unsupported distro: ${ID}-${VERSION_ID}"
@ -421,7 +433,7 @@ sudo virt-install --name="${IMAGE_KEY}-http"\
--vcpus 2 \ --vcpus 2 \
--network network=integration,mac=34:49:22:B0:83:30 \ --network network=integration,mac=34:49:22:B0:83:30 \
--os-type linux \ --os-type linux \
--os-variant rhel8-unknown \ --os-variant "${OS_VARIANT}" \
--pxe \ --pxe \
--boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \ --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
--nographics \ --nographics \