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

tests: remove all traces of Fedora 32

Browse source 
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-06-30 14:31:17 +02:00 • committed by Ondřej Budai
parent 4e4012df28
commit 0201822c50
3 changed files with 1 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/cases/api.sh
View file

@ -338,10 +338,6 @@ case $(set +x; . /etc/os-release; echo "$ID-$VERSION_ID") in
DISTRO="rhel-8"
SSH_USER="cloud-user"
;;
"fedora-32")
DISTRO="fedora-32"
SSH_USER="fedora"
;;
"fedora-33")
DISTRO="fedora-33"
SSH_USER="fedora"

8
test/cases/ostree.sh
View file

@ -157,13 +157,7 @@ build_image() {
# Start the compose.
greenprint "🚀 Starting compose"
if [[ $blueprint_name == upgrade ]]; then
# composer-cli in Fedora 32 has a different start-ostree arguments
# see https://github.com/weldr/lorax/pull/1051
if [[ "${ID}-${VERSION_ID}" == fedora-32 ]]; then
sudo composer-cli --json compose start-ostree "$blueprint_name" $IMAGE_TYPE "$OSTREE_REF" "$COMMIT_HASH" | tee "$COMPOSE_START"
else
sudo composer-cli --json compose start-ostree --ref "$OSTREE_REF" --parent "$COMMIT_HASH" "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START"
fi
sudo composer-cli --json compose start-ostree --ref "$OSTREE_REF" --parent "$COMMIT_HASH" "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START"
else
sudo composer-cli --json compose start "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START"
fi