Whamcloud - gitweb
LU-10334 tests: add tests to ALWAYS_EXCEPT for Ubuntu 47/32047/3
authorJames Nunez <james.a.nunez@intel.com>
Wed, 18 Apr 2018 14:51:17 +0000 (08:51 -0600)
committerJohn L. Hammond <john.hammond@intel.com>
Thu, 3 May 2018 19:59:47 +0000 (19:59 +0000)
Several tests are known to fail when running on Ubuntu clients:
tests 103a, 130a, 130b, 130c, 130d, 130e, 400a, and 410.

Add these tests to the ALWAYS_EXCEPT list to allow Ubuntu
testing to pass.

Lustre-change: https://review.whamcloud.com/31828
Lustre-commit: 68be7b634d8e46c110f11916dd87b9f1c36a90e1

Test-Parameters: trivial clientdistro=ubuntu1604 serverdistro=el7 testlist=sanity
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I096db598e9d8f5e1722f22a3213da5b3553cf89c
Reviewed-on: https://review.whamcloud.com/32047
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Saurabh Tandan <saurabh.tandan@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
lustre/tests/sanity.sh

index 4601f0d..5f2f8fb 100755 (executable)
@@ -18,24 +18,6 @@ ALWAYS_EXCEPT="  407     253     312 $ALWAYS_EXCEPT"
 # Check Grants after these tests
 GRANT_CHECK_LIST="$GRANT_CHECK_LIST 42a 42b 42c 42d 42e 63a 63b 64a 64b 64c"
 
-is_sles11()                                            # LU-4341
-{
-       if [ -r /etc/SuSE-release ]
-       then
-               local vers=$(grep VERSION /etc/SuSE-release | awk '{print $3}')
-               local patchlev=$(grep PATCHLEVEL /etc/SuSE-release |
-                       awk '{ print $3 }')
-               if [ $vers -eq 11 ] && [ $patchlev -ge 3 ]; then
-                       return 0
-               fi
-       fi
-       return 1
-}
-
-if is_sles11; then                                     # LU-4341
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 170"
-fi
-
 SRCDIR=$(cd $(dirname $0); echo $PWD)
 export PATH=$PATH:/sbin
 
@@ -87,6 +69,43 @@ if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
        [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b"
 fi
 
+
+is_sles11()                                            # LU-4341
+{
+       if [ -r /etc/SuSE-release ]
+       then
+               local vers=$(grep VERSION /etc/SuSE-release | awk '{print $3}')
+               local patchlev=$(grep PATCHLEVEL /etc/SuSE-release |
+                       awk '{ print $3 }')
+               if [ $vers -eq 11 ] && [ $patchlev -ge 3 ]; then
+                       return 0
+               fi
+       fi
+       return 1
+}
+
+# Check if we are running on Ubuntu or SLES so we can make decisions on
+# what tests to run
+if is_sles11; then
+       # bug number for skipped test: LU-4341
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT  170"
+elif [ -r /etc/os-release ]; then
+       if grep -qi ubuntu /etc/os-release; then
+               ubuntu_version=$(version_code $(sed -n -e 's/"//g' \
+                                               -e 's/^VERSION=//p' \
+                                               /etc/os-release |
+                                               awk '{ print $1 }'))
+
+               if [[ $ubuntu_version -gt $(version_code 16.0.0) ]]; then
+                       # bug number for skipped test:
+                       #                LU-10334 LU-10335 LU-10335 LU-10335
+                       ALWAYS_EXCEPT+=" 103a     130a     130b     130c"
+                       #                LU-10335 LU-10335 LU-10365 LU-10366
+                       ALWAYS_EXCEPT+=" 130d     130e     400a     410"
+               fi
+       fi
+fi
+
 FAIL_ON_ERROR=false
 
 cleanup() {