From 5a0909dd20cd5174bd3cd9633a294293f7b6a303 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 29 Aug 2023 10:34:26 -0700 Subject: [PATCH] Add ubuntu to the list of targets we autopkgtest for on amd64, to ensure coverage of the lb_chroot_layered behavior. --- debian/changelog | 7 +++++++ debian/tests/default-bootstraps | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 94d6501c..004c50c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.27) UNRELEASED; urgency=medium + + * Add ubuntu to the list of targets we autopkgtest for on amd64, to ensure + coverage of the lb_chroot_layered behavior. + + -- Steve Langasek Tue, 29 Aug 2023 10:32:35 -0700 + livecd-rootfs (23.10.26) mantic; urgency=medium [ Ɓukasz 'sil2100' Zemczak ] diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 9d63d7a0..4c0d396f 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -43,11 +43,17 @@ ALL_TRIPLETS=" xubuntu:: xubuntu:minimal:" +ARCH=$(dpkg --print-architecture) + if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" ubuntu-base:: ubuntu-cpc::ubuntu-cpc " + if [ "$ARCH" = amd64 ]; then + SELECTED_TRIPLETS="$SELECTED_TRIPLETS +ubuntu::" + fi fi live_build_rootfs() { @@ -55,7 +61,6 @@ live_build_rootfs() { local SUBPROJECT_TMP=${1%:*} SUBPROJECT=${SUBPROJECT_TMP#*:} TEMPLATE=${1##*:} - ARCH=$(dpkg --print-architecture) echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD" cp -a /usr/share/livecd-rootfs/live-build/auto . if [ -n "$TEMPLATE" ]; then