diff options
| -rwxr-xr-x | build-appliance | 2 | ||||
| -rwxr-xr-x | fstests-bld/gen-tarball | 12 | ||||
| -rwxr-xr-x | test-appliance/gce-create-image | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/build-appliance b/build-appliance index 27746a4c..d6abd5d7 100755 --- a/build-appliance +++ b/build-appliance @@ -126,7 +126,7 @@ if $UPDATE; then else $BUILD_ENV make all-clean-first fi -$BUILD_ENV ./gen-tarball +$BUILD_ENV ./gen-tarball --arch "$ARCH" case "$OUT_TAR" in both) gen_image_args+=" --both" ;; diff --git a/fstests-bld/gen-tarball b/fstests-bld/gen-tarball index 99622b1b..55314fcd 100755 --- a/fstests-bld/gen-tarball +++ b/fstests-bld/gen-tarball @@ -31,6 +31,9 @@ do --fast) fast=yes ;; + --arch) shift + ARCH="$1" + ;; *) echo "unknown option: $1" exit 1 @@ -100,7 +103,16 @@ echo "STRIP xfstests/*" find xfstests -mindepth 2 -type f -perm /0111 | xargs $STRIP 2> /dev/null \ || true echo "TAR xfstests" +if test -n "$ARCH" +then + echo "$ARCH" > xfstests/build-arch +fi +rm -f xfstests.tar.gz find xfstests blktests -path blktests/.git -prune -o -print0 | \ LC_ALL=C sort -z | \ tar c --owner=0 --group=0 --numeric-owner --mtime="@${SOURCE_DATE_EPOCH}" \ --mode=go+u-w --null --no-recursion -T - | $GZIP > xfstests.tar.gz +if test -n "$ARCH" +then + ln -f xfstests.tar.gz "xfstests-$ARCH.tar.gz" +fi diff --git a/test-appliance/gce-create-image b/test-appliance/gce-create-image index f70a22ff..d51bfba2 100755 --- a/test-appliance/gce-create-image +++ b/test-appliance/gce-create-image @@ -139,8 +139,11 @@ setup_for_bookworm() setup_for_buster GS_TAR="gs://$GS_BUCKET/gce-xfstests.image.tar.gz" -TARBALL=../fstests-bld/xfstests.tar.gz - +TARBALL=../fstests-bld/xfstests-$ARCH.tar.gz +if ! test -f "$TARBALL" +then + TARBALL=../fstests-bld/xfstests.tar.gz +fi if ! test -f $TARBALL ; then echo $TARBALL does not exist! exit 1 |