From 1f857c7e2212110f317502e48c91af8d0c730352 Mon Sep 17 00:00:00 2001
From: Daniel Guerra <15204776+danielmx-dev@users.noreply.github.com>
Date: Thu, 12 Dec 2024 12:12:36 -0600
Subject: [PATCH] Skip mysqlcheck SSL Requirement during E2E environment setup
 (#9941)

---
 bin/docker-setup.sh                          | 4 ++--
 changelog/fix-skip-ssl-requirement-env-setup | 4 ++++
 tests/e2e/env/setup.sh                       | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 changelog/fix-skip-ssl-requirement-env-setup

diff --git a/bin/docker-setup.sh b/bin/docker-setup.sh
index 66c9fa1ee8b..6db41510908 100755
--- a/bin/docker-setup.sh
+++ b/bin/docker-setup.sh
@@ -27,11 +27,11 @@ cli()
 set +e
 # Wait for containers to be started up before the setup.
 # The db being accessible means that the db container started and the WP has been downloaded and the plugin linked
-cli wp db check --path=/var/www/html --quiet > /dev/null
+cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 while [[ $? -ne 0 ]]; do
 	echo "Waiting until the service is ready..."
 	sleep 5
-	cli wp db check --path=/var/www/html --quiet > /dev/null
+	cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 done
 
 # If the plugin is already active then return early
diff --git a/changelog/fix-skip-ssl-requirement-env-setup b/changelog/fix-skip-ssl-requirement-env-setup
new file mode 100644
index 00000000000..691f98adbfa
--- /dev/null
+++ b/changelog/fix-skip-ssl-requirement-env-setup
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Skip mysqlcheck SSL Requirement during E2E environment setup
diff --git a/tests/e2e/env/setup.sh b/tests/e2e/env/setup.sh
index d2aa3a50e89..5ab08183bac 100755
--- a/tests/e2e/env/setup.sh
+++ b/tests/e2e/env/setup.sh
@@ -123,11 +123,11 @@ step "Setting up CLIENT site"
 # Wait for containers to be started up before the setup.
 # The db being accessible means that the db container started and the WP has been downloaded and the plugin linked
 set +e
-cli wp db check --path=/var/www/html --quiet > /dev/null
+cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 while [[ $? -ne 0 ]]; do
 	echo "Waiting until the service is ready..."
 	sleep 5
-	cli wp db check --path=/var/www/html --quiet > /dev/null
+	cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 done
 echo "Client DB is up and running..."
 set -e