summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Mauelshagen <heinzm@redhat.com>2018-09-11 15:39:31 +0200
committerHeinz Mauelshagen <heinzm@redhat.com>2018-09-11 15:53:25 +0200
commitdf67b1da4d5ee4cf4514f655dbc5a58193364cbd (patch)
tree64c4941564551233bad6c98dbab0f3d6d29d5d8f
parentd0ff078e77e9f1018d14e824ae16b5d861a7f818 (diff)
downloadlvm2-df67b1da4d5ee4cf4514f655dbc5a58193364cbd.tar.gz
tests: adjust target version to enable reshape tests
Bump target version to 1.14.0 which contains fixes for reshape deadlock/corruption to allow tests to run once the respective fixes show up in kernels. Remove now superfluous multi-core checks. Resolves: rhbz1501145 Related: rhbz1514539 Related: rhbz1586123 Related: rhbz1613039
-rw-r--r--test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh5
-rw-r--r--test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh7
-rw-r--r--test/shell/lvconvert-raid-reshape-linear_to_striped.sh5
-rw-r--r--test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh6
-rw-r--r--test/shell/lvconvert-raid-reshape-striped_to_linear.sh6
-rw-r--r--test/shell/lvconvert-raid-reshape.sh7
-rw-r--r--test/shell/lvconvert-raid-restripe-linear.sh5
7 files changed, 7 insertions, 34 deletions
diff --git a/test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh b/test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh
index 05cb61635..cbacf4a76 100644
--- a/test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh
+++ b/test/shell/lvconvert-raid-reshape-linear_to_raid6-single-type.sh
@@ -19,11 +19,8 @@ SKIP_WITH_LVMPOLLD=1
aux lvmconf 'activation/raid_region_size = 512'
which mkfs.ext4 || skip
-aux have_raid 1 13 1 || skip
+aux have_raid 1 14 0 || skip
-# Temporarily skip reshape tests on single-core CPUs until there's a fix for
-# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
-aux have_multi_core || skip
aux prepare_vg 5
#
diff --git a/test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh b/test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh
index 7e31cb9f6..c9c43217b 100644
--- a/test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh
+++ b/test/shell/lvconvert-raid-reshape-linear_to_striped-single-type.sh
@@ -18,12 +18,7 @@ SKIP_WITH_LVMPOLLD=1
aux lvmconf 'activation/raid_region_size = 512'
which mkfs.ext4 || skip
-aux have_raid 1 13 1 || skip
-
-# Temporarily skip reshape tests on single-core CPUs until there's a fix for
-# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
-aux have_multi_core || skip
-aux prepare_vg 5
+aux have_raid 1 14 0 || skip
#
# Test multi step linear -> striped conversion
diff --git a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
index 04e2d62c1..c398c5e3c 100644
--- a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
+++ b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
@@ -17,11 +17,8 @@ SKIP_WITH_LVMPOLLD=1
aux lvmconf 'activation/raid_region_size = 512'
which mkfs.ext4 || skip
-aux have_raid 1 12 0 || skip
+aux have_raid 1 14 0 || skip
-# Temporarily skip reshape tests on single-core CPUs until there's a fix for
-# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
-aux have_multi_core || skip
aux prepare_vg 5
#
diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh
index 476fb1095..60fc59f6a 100644
--- a/test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh
+++ b/test/shell/lvconvert-raid-reshape-striped_to_linear-single-type.sh
@@ -18,11 +18,7 @@ SKIP_WITH_LVMPOLLD=1
aux lvmconf 'activation/raid_region_size = 512'
which mkfs.ext4 || skip
-aux have_raid 1 13 1 || skip
-
-# Temporarily skip reshape tests on single-core CPUs until there's a fix for
-# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
-aux have_multi_core || skip
+aux have_raid 1 14 0 || skip
aux prepare_vg 5
diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
index ccbe6ad38..e217ea362 100644
--- a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
+++ b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
@@ -18,11 +18,7 @@ SKIP_WITH_LVMPOLLD=1
aux lvmconf 'activation/raid_region_size = 512'
which mkfs.ext4 || skip
-aux have_raid 1 12 0 || skip
-
-# Temporarily skip reshape tests on single-core CPUs until there's a fix for
-# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
-aux have_multi_core || skip
+aux have_raid 1 14 0 || skip
aux prepare_vg 5 20
diff --git a/test/shell/lvconvert-raid-reshape.sh b/test/shell/lvconvert-raid-reshape.sh
index ab3ea4e72..28c7e2d12 100644
--- a/test/shell/lvconvert-raid-reshape.sh
+++ b/test/shell/lvconvert-raid-reshape.sh
@@ -18,12 +18,7 @@ LVM_SKIP_LARGE_TESTS=0
. lib/inittest
which mkfs.ext4 || skip
-aux have_raid 1 13 99 || skip # needed to address RHBZ#1501145
-
-# Temporarily skip reshape tests on single-core CPUs until there's a fix for
-# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
-#aux have_multi_core || skip
-# dropping single-core limitation with 1.12 target
+aux have_raid 1 14 0 || skip
if [ $LVM_SKIP_LARGE_TESTS -eq 0 ]
then
diff --git a/test/shell/lvconvert-raid-restripe-linear.sh b/test/shell/lvconvert-raid-restripe-linear.sh
index 0ac8a048a..70d31dbf9 100644
--- a/test/shell/lvconvert-raid-restripe-linear.sh
+++ b/test/shell/lvconvert-raid-restripe-linear.sh
@@ -16,11 +16,8 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
which mkfs.ext4 || skip
-aux have_raid 1 12 0 || skip
+aux have_raid 1 14 0 || skip
-# Temporarily skip reshape tests on single-core CPUs until there's a fix for
-# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
-aux have_multi_core || skip
aux prepare_vg 5
#