Skip to content

Commit 777c803

Browse files
committed
Bug#36483326 Run ndb tests with hardening features on in PB2 even if TLS is not supported
Remove NDB TLS from ndb-sec runs on EL7 and Solaris. Change-Id: I428a5477c78b76b28c9c5c00f80043d3b6348a92
1 parent 2740eb3 commit 777c803

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

mysql-test/collections/default.weekly-ndbcluster

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --debug
1717
# ps-protocol
1818
perl mysql-test-run.pl --force --timer --big-test --testcase-timeout=90 --debug-server --comment=ndbcluster_ps --vardir=var-ndbcluster-ps --ps-protocol --suite=ndbcluster
1919
# with security features in ndb cluster: encrypted backup, TDE, TLS.
20-
perl mysql-test-run.pl --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
20+
# on el7 and solaris no support for NDB TLS
21+
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
2123

2224
# 3. Run the suites that are not part of the default - funcs_2, stress, jp, nist
2325
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ perl mysql-test-run.pl --debug-server --force --timer --testcase-timeout=60 --su
1515
# If no Ndb support, no tests will be attempted.
1616
perl mysql-test-run.pl --debug-server --force --timer --testcase-timeout=60 --suite-timeout=600 --comment=ndb --vardir=var-ndb --report-features --no-skip --with-ndb-only
1717
# with security features in ndb cluster: encrypted backup, TDE, TLS.
18-
perl mysql-test-run.pl --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
18+
# on el7 and solaris no support for NDB TLS
19+
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
20+
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
1921

2022
############END OF SECTION1(DEFAULT SUITES) ######################
2123

mysql-test/suite/ndb/secure-notls.cnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
!include encrypted_backup.cnf
2+
!include encrypted_filesystem.cnf

0 commit comments

Comments
 (0)