Skip to content

Commit 5b1bda6

Browse files
committed
Bug#36493264 Do not run ndb_tls test suite on EL7 and Solaris 11 which uses OpenSSL 1.0
Post push fix. Also need to skip ndb_tls for el7 and solaris11 for mysql-8.4 and mysql-trunk in default.weekly-ndbcluster and default.weekly.basic. Change-Id: I9a3bcbf2f0a9ad92fa4ab5deb041e9842acb0c96
1 parent fd017a0 commit 5b1bda6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mysql-test/collections/default.weekly-ndbcluster

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --debug
1919
# with security features in ndb cluster: encrypted backup, TDE, TLS.
2020
# on el7 and solaris no support for NDB TLS
2121
perl mysql-test-run.pl --exclude-platform=_el7-|_solaris11- --force --timer --big-test --testcase-timeout=90 --debug-server --comment=ndbcluster-sec --vardir=var-ndbcluster-sec --suite=ndbcluster --defaults-extra-file=suite/ndb/secure.cnf
22-
perl mysql-test-run.pl --platform=_el7-|_solaris11- --force --timer --big-test --testcase-timeout=90 --debug-server --comment=ndbcluster-sec-notls --vardir=var-ndbcluster-sec-notls --suite=ndbcluster --defaults-extra-file=suite/ndb/secure-notls.cnf
22+
perl mysql-test-run.pl --platform=_el7-|_solaris11- --force --timer --big-test --testcase-timeout=90 --debug-server --comment=ndbcluster-sec-notls --vardir=var-ndbcluster-sec-notls --suite=ndbcluster --defaults-extra-file=suite/ndb/secure-notls.cnf --skip-suite=ndb_tls
2323

2424
# 3. Run the suites that are not part of the default - funcs_2, stress, jp, nist
2525
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=60 --debug-server --comment=funcs2-debug --vardir=var-funcs2-big --suite=funcs_2

mysql-test/collections/default.weekly.basic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ perl mysql-test-run.pl --exclude-platform=_el7-|_solaris11- --debug-server --for
1818
# with security features in ndb cluster: encrypted backup, TDE, TLS.
1919
# on el7 and solaris no support for NDB TLS
2020
perl mysql-test-run.pl --exclude-platform=_el7-|_solaris11- --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600 --comment=ndb-sec --vardir=var-ndb-sec --report-features --no-skip --with-ndb-only --defaults-extra-file=suite/ndb/secure.cnf
21-
perl mysql-test-run.pl --platform=_el7-|_solaris11- --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600 --comment=ndb-sec-notls --vardir=var-ndb-sec-notls --report-features --no-skip --with-ndb-only --defaults-extra-file=suite/ndb/secure-notls.cnf
21+
perl mysql-test-run.pl --platform=_el7-|_solaris11- --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600 --comment=ndb-sec-notls --vardir=var-ndb-sec-notls --report-features --no-skip --with-ndb-only --defaults-extra-file=suite/ndb/secure-notls.cnf --skip-suite=ndb_tls
2222

2323
############END OF SECTION1(DEFAULT SUITES) ######################
2424

0 commit comments

Comments
 (0)