From: James Nunez <jnunez@whamcloud.com>
Date: Fri, 19 Jun 2020 18:01:42 +0000 (-0600)
Subject: LU-13514 tests: remove upgrade images for conf-sanity
X-Git-Tag: 2.13.55~37
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d574a55778f035691bd3bed621cfcdb8200a9785;ds=sidebyside

LU-13514 tests: remove upgrade images for conf-sanity

conf-sanity test 32a is hanging at a high rate.  We need to
explore if the issue involves old images are having problems
upgrading to the latest version of Lustre.

Test-Parameters: trivial
Test-Parameters: env=ONLY=32a,ONLY_REPEAT=20 fstype=ldiskfs testlist=conf-sanity
Test-Parameters: env=ONLY=32 fstype=zfs testlist=conf-sanity
Signed-off-by: James Nunez <jnunez@whamcloud.com>
Change-Id: I0ff1e9e1304192b1008551b82133d95a0010c86a
Reviewed-on: https://review.whamcloud.com/39109
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 9e1f61d..db36a30 100644
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -4,9 +4,8 @@ AM_CFLAGS := -fPIC -D_GNU_SOURCE \
 
 DIST_SUBDIRS = mpi
 
-noinst_DATA = disk1_8_up_2_5-ldiskfs.tar.bz2 disk2_1_up_2_5-ldiskfs.tar.bz2
-noinst_DATA += disk2_3_up_2_5-ldiskfs.tar.bz2 disk2_4-ldiskfs.tar.bz2
-noinst_DATA += disk2_4-zfs.tar.bz2 disk2_7-ldiskfs.tar.bz2 disk2_7-zfs.tar.bz2
+noinst_DATA = disk2_4-ldiskfs.tar.bz2 disk2_4-zfs.tar.bz2
+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 += ldiskfs_mdt1_2_11.tar.bz2 ldiskfs_mdt2_2_11.tar.bz2
 noinst_DATA += ldiskfs_ost1_2_11.tar.bz2 ldiskfs_ost2_2_11.tar.bz2
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index ffba742..57b97c7 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -71,7 +71,7 @@ gen_config() {
 	# and stop to generate the startup logs.
 	start_mds
 	start_ost
-        wait_osc_import_state mds ost FULL
+	wait_osc_import_state mds ost FULL
 	stop_ost
 	stop_mds
 }
@@ -95,7 +95,7 @@ writeconf_or_reformat() {
 }
 
 reformat() {
-        formatall
+	formatall
 }
 
 start_mgs () {
@@ -157,9 +157,9 @@ stop_mds() {
 }
 
 stop_mgs() {
-       echo "stop mgs service on `facet_active_host mgs`"
-       # These tests all use non-failover stop
-       stop mgs -f  || return 97
+	echo "stop mgs service on `facet_active_host mgs`"
+	# These tests all use non-failover stop
+	stop mgs -f  || return 97
 }
 
 start_ost() {
@@ -254,8 +254,8 @@ check_mount() {
 	do_facet client "cp /etc/passwd $DIR/a" || return 71
 	do_facet client "rm $DIR/a" || return 72
 	# make sure lustre is actually mounted (touch will block,
-        # but grep won't, so do it after)
-        do_facet client "grep $MOUNT' ' /proc/mounts > /dev/null" || return 73
+	# but grep won't, so do it after)
+	do_facet client "grep $MOUNT' ' /proc/mounts > /dev/null" || return 73
 	echo "setup single mount lustre success"
 }
 
diff --git a/lustre/tests/disk1_8_up_2_5-ldiskfs.tar.bz2 b/lustre/tests/disk1_8_up_2_5-ldiskfs.tar.bz2
deleted file mode 100644
index 100b630..0000000
Binary files a/lustre/tests/disk1_8_up_2_5-ldiskfs.tar.bz2 and /dev/null differ
diff --git a/lustre/tests/disk2_1_up_2_5-ldiskfs.tar.bz2 b/lustre/tests/disk2_1_up_2_5-ldiskfs.tar.bz2
deleted file mode 100644
index 18e440f..0000000
Binary files a/lustre/tests/disk2_1_up_2_5-ldiskfs.tar.bz2 and /dev/null differ
diff --git a/lustre/tests/disk2_3_up_2_5-ldiskfs.tar.bz2 b/lustre/tests/disk2_3_up_2_5-ldiskfs.tar.bz2
deleted file mode 100644
index 0d10540..0000000
Binary files a/lustre/tests/disk2_3_up_2_5-ldiskfs.tar.bz2 and /dev/null differ