Skip to content

Commit c94fb10

Browse files
authored
Remove CI builder customization from TEST
The default options are reasonable for all of the CI builders. * TEST_XFSTESTS_SKIP=yes - This is already the default. * TEST_ZTEST_TIMEOUT=3600 - Increased ztest run time only increases code coverage by a small degree. Default 900s runs are sufficient. * Disabling certain tests on 32-bit builders is no longer needed. Reviewed-by: George Melikov <[email protected]> Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Kjeld Schouten <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#10129
1 parent d3fe62c commit c94fb10

File tree

1 file changed

+0
-61
lines changed

1 file changed

+0
-61
lines changed

TEST

-61
Original file line numberDiff line numberDiff line change
@@ -48,64 +48,3 @@
4848
#TEST_ZFSSTRESS_VDEV="/var/tmp/vdev"
4949
#TEST_ZFSSTRESS_DIR="/$TEST_ZFSSTRESS_POOL/$TEST_ZFSSTRESS_FS"
5050
#TEST_ZFSSTRESS_OPTIONS=""
51-
52-
### per-builder customization
53-
#
54-
# BB_NAME=builder-name <distribution-version-architecture-type>
55-
# - distribution=Amazon,Debian,Fedora,RHEL,SUSE,Ubuntu
56-
# - version=x.y
57-
# - architecture=x86_64,i686,arm,aarch64
58-
# - type=build,test
59-
#
60-
case "$BB_NAME" in
61-
Amazon*)
62-
# ZFS enabled xfstests fails to build
63-
TEST_XFSTESTS_SKIP="yes"
64-
;;
65-
CentOS-7*)
66-
# ZFS enabled xfstests fails to build
67-
TEST_XFSTESTS_SKIP="yes"
68-
;;
69-
CentOS-6*)
70-
;;
71-
Debian*)
72-
;;
73-
Fedora*)
74-
;;
75-
RHEL*)
76-
;;
77-
SUSE*)
78-
;;
79-
Ubuntu-16.04*)
80-
# ZFS enabled xfstests fails to build
81-
TEST_XFSTESTS_SKIP="yes"
82-
;;
83-
Ubuntu*)
84-
;;
85-
*)
86-
;;
87-
esac
88-
89-
###
90-
#
91-
# Run ztest longer on the "coverage" builders to gain more code coverage
92-
# data out of ztest, libzpool, etc.
93-
#
94-
case "$BB_NAME" in
95-
*coverage*)
96-
TEST_ZTEST_TIMEOUT=3600
97-
;;
98-
*)
99-
TEST_ZTEST_TIMEOUT=900
100-
;;
101-
esac
102-
103-
###
104-
#
105-
# Disable the following test suites on 32-bit systems.
106-
#
107-
if [ $(getconf LONG_BIT) = "32" ]; then
108-
TEST_ZTEST_SKIP="yes"
109-
TEST_XFSTESTS_SKIP="yes"
110-
TEST_ZFSSTRESS_SKIP="yes"
111-
fi

0 commit comments

Comments
 (0)