From: James Nunez <jnunez@whamcloud.com>
Date: Mon, 9 Sep 2019 20:13:13 +0000 (-0600)
Subject: LU-12336 build: Revert Update ZFS version to 0.8.1
X-Git-Tag: 2.12.90~185
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F36137%2F3;p=fs%2Flustre-release.git

LU-12336 build: Revert Update ZFS version to 0.8.1

Revert "LU-12336 build: Update ZFS version to 0.8.1"

We've seen an uptick in autotest testing failures for ZFS
testing and are investigating if moving to ZFS 0.8.1 is a
cause of these failures.  Thus, run the ZFS test sessions
multiple times to get a baseline of test failures with
ZFS 0.7.13.

This reverts commit dba32e417635359b1d68180b77193e1c9ddd1e8f.

Test-Parameters: trivial testgroup=review-dne-zfs-part-1
Test-Parameters: testgroup=review-dne-zfs-part-2
Test-Parameters: testgroup=review-dne-zfs-part-3
Test-Parameters: testgroup=review-dne-zfs-part-4
Test-Parameters: testgroup=review-zfs

Signed-off-by: James Nunez <jnunez@whamcloud.com>
Change-Id: Iedb5c5411c721cfe738a7d3db455b222e7b4050d
Reviewed-on: https://review.whamcloud.com/36137
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 813c419..2d070098 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1006,11 +1006,11 @@ build_spl_zfs() {
     # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the
     # destination for the rpms
     export RPM_BUILD_ROOT=$TOPDIR
-    SPLZFSVER=${SPLZFSVER:-0.8.1}
+    SPLZFSVER=${SPLZFSVER:-0.7.13}
     SPLZFSTAG=${SPLZFSTAG:-}
     # "spl zfs" prior to 0.8.0
     # "zfs" for 0.8.0 and later
-    SPLZFSPKGS="zfs"
+    SPLZFSPKGS="spl zfs"
 
     # The files expect a kver to be set to the kernel version .
     local kver=$(find_linux_release)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index e015a47..8c78ab1 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -29,7 +29,7 @@ TBD Whamcloud
          4.15.0-48           (Ubuntu 18.04)
          vanilla linux 4.15.0 (ZFS only)
        * Recommended e2fsprogs version: 1.45.2.wc1 or newer
-       * Recommended ZFS version: 0.8.1
+       * Recommended ZFS / SPL version: 0.7.13
        * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
          since the NFSv4 export of Lustre filesystem with 4K stack may cause a
          stack overflow. For more information, please refer to bugzilla 17630.