Whamcloud - gitweb
LU-10334 tests: add tests to ALWAYS_EXCEPT for Ubuntu 28/31828/5
authorJames Nunez <james.a.nunez@intel.com>
Thu, 29 Mar 2018 19:25:36 +0000 (13:25 -0600)
committerOleg Drokin <oleg.drokin@intel.com>
Fri, 30 Mar 2018 22:05:21 +0000 (22:05 +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.

Test-Parameters: trivial
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I5ff51e94536f4382d670c9a4a1ce0af0c2832b4c
Reviewed-on: https://review.whamcloud.com/31828
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Saurabh Tandan <saurabh.tandan@intel.com>
lustre/tests/sanity.sh

index cdc56bf..567d2cb 100755 (executable)
@@ -69,11 +69,10 @@ if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
        [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b"
 fi
 
        [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b"
 fi
 
-# Get the SLES version so we can make decisions on if a test should be run
+# Get the SLES distro version
 #
 # Returns a version string that should only be used in comparing
 # strings returned by version_code()
 #
 # Returns a version string that should only be used in comparing
 # strings returned by version_code()
-
 sles_version_code()
 {
        local version=$(grep VERSION_ID /etc/os-release | cut -d'"' -f2)
 sles_version_code()
 {
        local version=$(grep VERSION_ID /etc/os-release | cut -d'"' -f2)
@@ -83,6 +82,8 @@ sles_version_code()
        version_code $sles_version
 }
 
        version_code $sles_version
 }
 
+# Check if we are running on Ubuntu or SLES so we can make decisions on
+# what tests to run
 if [ -r /etc/SuSE-release ]; then
        sles_version=$(sles_version_code)
        [ $sles_version -lt $(version_code 11.4.0) ] &&
 if [ -r /etc/SuSE-release ]; then
        sles_version=$(sles_version_code)
        [ $sles_version -lt $(version_code 11.4.0) ] &&
@@ -91,6 +92,21 @@ if [ -r /etc/SuSE-release ]; then
        [ $sles_version -lt $(version_code 12.0.0) ] &&
                # bug number for skipped test: LU-3703
                ALWAYS_EXCEPT="$ALWAYS_EXCEPT  234"
        [ $sles_version -lt $(version_code 12.0.0) ] &&
                # bug number for skipped test: LU-3703
                ALWAYS_EXCEPT="$ALWAYS_EXCEPT  234"
+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
 fi
 
 FAIL_ON_ERROR=false