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

test/ostree-raw: separate osname variable in playbook

Browse source 
The image_type variable in the playbook is used for the name of the
deployment, which is 'redhat' by default for RHEL and 'fedora-iot' for
Fedora.
This affects the deployment path checks, for example:
    {{ device_name  }}[/ostree/deploy/{{ image_type  }}/var]
This commit is contained in:
Achilleas Koutsou 2022-09-09 10:58:41 +02:00 • committed by Tom Gundersen
parent b38cfc2ad6
commit 7072432b0f
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,7 @@ CONTAINER_TYPE=edge-container
CONTAINER_FILENAME=container.tar CONTAINER_FILENAME=container.tar
RAW_IMAGE_TYPE=edge-raw-image RAW_IMAGE_TYPE=edge-raw-image
RAW_IMAGE_FILENAME=image.raw.xz RAW_IMAGE_FILENAME=image.raw.xz
OSTREE_OSNAME=redhat
# Set up temporary files. # Set up temporary files.
TEMPDIR=$(mktemp -d) TEMPDIR=$(mktemp -d)
@ -105,6 +106,7 @@ case "${ID}-${VERSION_ID}" in
RAW_IMAGE_TYPE=fedora-iot-raw-image RAW_IMAGE_TYPE=fedora-iot-raw-image
OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot" OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
OS_VARIANT="fedora-unknown" OS_VARIANT="fedora-unknown"
OSTREE_OSNAME="fedora-iot"
;; ;;
*) *)
echo "unsupported distro: ${ID}-${VERSION_ID}" echo "unsupported distro: ${ID}-${VERSION_ID}"
@ -457,7 +459,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD}
EOF EOF
# Test IoT/Edge OS # Test IoT/Edge OS
sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0
check_result check_result
# Clean up BIOS VM # Clean up BIOS VM
@ -530,7 +532,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD}
EOF EOF
# Test IoT/Edge OS # Test IoT/Edge OS
sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0
check_result check_result
################################################################## ##################################################################
@ -663,7 +665,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD}
EOF EOF
# Test IoT/Edge OS # Test IoT/Edge OS
sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${UPGRADE_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e ostree_commit="${UPGRADE_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0
check_result check_result
# Final success clean up # Final success clean up