From: Andreas Dilger Date: Thu, 4 Apr 2024 03:36:24 +0000 (-0600) Subject: LU-10215 tests: remove disk2_4 disk2_5 images X-Git-Tag: 2.15.63~70 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F47281%2F4;p=fs%2Flustre-release.git LU-10215 tests: remove disk2_4 disk2_5 images Remove the old disk2_4-*.tar.bz2 and disk2_5-ldiskfs.tar.bz2 images from the Git repo. The disk2_5 image was never included into testing due to an oversight in Makefile.am, and adding it to testing is unlikely to be of any practical value as these releases are both more than 10 years old and very unlikely to have any users that would actually want to upgrade their systems at this point. Test-Parameters: trivial Test-Parameters: testlist=conf-sanity env=ONLY=32 mdscount=1 mdtcount=1 Test-Parameters: testlist=conf-sanity env=ONLY=32 mdscount=2 mdtcount=4 Signed-off-by: Andreas Dilger Change-Id: I76a42eb90c3e1198d33783f3089ac30462429ac4 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/47281 Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index 08da540..7f33dfa 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -5,7 +5,7 @@ AM_CFLAGS := -fPIC -D_GNU_SOURCE \ DIST_SUBDIRS = mpi DIST_SUBDIRS += lutf iabf -noinst_DATA = disk2_4-ldiskfs.tar.bz2 disk2_4-zfs.tar.bz2 +noinst_DATA = noinst_DATA += disk2_7-ldiskfs.tar.bz2 disk2_7-zfs.tar.bz2 noinst_DATA += disk2_9-zfs.tar.bz2 disk2_9-ldiskfs.tar.bz2 noinst_DATA += disk2_10-ldiskfs.tar.bz2 disk2_12-ldiskfs.tar.bz2 diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index fbb1c9b..1f1ddca 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -2942,17 +2942,12 @@ test_32d() { t32_check for tarball in $tarballs; do - banner "testing $tarball upgrade with ff and project upgrade" - project_upgrade="no" - [[ "$MDS1_VERSION" -ge $(version_code 2.13.54) ]] && - [[ "$tarball" =~ "disk2_4-ldiskfs" ]] && - project_upgrade="yes" - project_upgrade=$project_upgrade ff_convert=yes t32_test \ - $tarball || rc=$? + banner "testing $tarball with filter_fid upgrade" + ff_convert=yes t32_test $tarball || rc=$? done return $rc } -run_test 32d "convert ff and project quota upgrade test" +run_test 32d "convert filter_fid upgrade test" test_32e() { [[ "$MDS1_VERSION" -ge $(version_code 2.10.56) ]] || diff --git a/lustre/tests/disk2_4-ldiskfs.tar.bz2 b/lustre/tests/disk2_4-ldiskfs.tar.bz2 deleted file mode 100644 index 623c376..0000000 Binary files a/lustre/tests/disk2_4-ldiskfs.tar.bz2 and /dev/null differ diff --git a/lustre/tests/disk2_4-zfs.tar.bz2 b/lustre/tests/disk2_4-zfs.tar.bz2 deleted file mode 100644 index 15c6dff..0000000 Binary files a/lustre/tests/disk2_4-zfs.tar.bz2 and /dev/null differ diff --git a/lustre/tests/disk2_5-ldiskfs.tar.bz2 b/lustre/tests/disk2_5-ldiskfs.tar.bz2 deleted file mode 100644 index 0813cd8..0000000 Binary files a/lustre/tests/disk2_5-ldiskfs.tar.bz2 and /dev/null differ