Skip to content

Commit

Permalink
Fix skipped tests in Mariadb integration CI
Browse files Browse the repository at this point in the history
  • Loading branch information
samuel40791765 committed Apr 16, 2024
1 parent 86ae10b commit 3328532
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 33 deletions.

This file was deleted.

16 changes: 16 additions & 0 deletions tests/ci/integration/mariadb_patch/auto-chaining.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 530872c4..235bf76f 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -354,6 +354,11 @@ new_VioSSLFd(const char *key_file, const char *cert_file, const char *ca_file,
}

SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
+ /*
+ This reverts AWS-LC to the default OpenSSL auto-chaining behavior. Since
+ OpenSSL enables auto-chaining by default, this is a no-op with OpenSSL.
+ */
+ SSL_CTX_clear_mode(ssl_fd->ssl_context, SSL_MODE_NO_AUTO_CHAIN);

/*
Set the ciphers that can be used
12 changes: 12 additions & 0 deletions tests/ci/integration/mariadb_patch/ssl_crl_expect.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/mysql-test/main/ssl_crl.test b/mysql-test/main/ssl_crl.test
index 9b475857..58d23087 100644
--- a/mysql-test/main/ssl_crl.test
+++ b/mysql-test/main/ssl_crl.test
@@ -8,6 +8,6 @@

--echo # try logging in with a certificate in the server's --ssl-crl : should fail
# OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different
---replace_regex /ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+/ERROR 2026 (HY000): TLS\/SSL error: sslv3 alert certificate revoked/
+--replace_regex /ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+/ERROR 2026 (HY000): TLS\/SSL error: sslv3 alert certificate revoked/SSLV3_ALERT_CERTIFICATE_REVOKED/
--error 1
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1
7 changes: 2 additions & 5 deletions tests/ci/integration/run_mariadb_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,8 @@ function mariadb_run_tests() {
main.flush_logs_not_windows : query 'flush logs' succeeded - should have failed with error ER_CANT_CREATE_FILE (1004)
main.mysql_upgrade_noengine : upgrade output order does not match the expected
main.plugin_load : This test generates a warning in Codebuild. Skip over since this isn't relevant to AWS-LC.
main.ssl_crl : This test is flaky in CodeBuild CI P112867839
main.desc_index_min_max : This test is flaky in CodeBuild CI P112867839
main.ssl_autoverify : Failing with - TLS/SSL error: unable to get local issuer certificate
main.mysql : Failing with - TLS/SSL error: unable to get local issuer certificate
main.ssl_fp : Failing with - TLS/SSL error: unable to get local issuer certificate"> skiplist
main.desc_index_min_max : This test is flaky and unrelated to aws-lc.
"> skiplist
./mtr --suite=main --force --parallel=auto --skip-test-list=${MARIADB_BUILD_FOLDER}/mysql-test/skiplist --retry-failure=2
popd
}
Expand Down

0 comments on commit 3328532

Please sign in to comment.