From 40eda6a82376176e9dcce8aa59041952591ddf20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sil=C3=A9n?= Date: Thu, 19 Sep 2024 18:40:02 +0300 Subject: [PATCH] Add MariaDB to E2E (#10724) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add mariadb to Validate and Upgrade E2E tests Signed-off-by: robertsilen Signed-off-by: Robert Silén Co-authored-by: Derek Nola --- tests/e2e/upgradecluster/Vagrantfile | 11 ++++++++++- tests/e2e/validatecluster/Vagrantfile | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tests/e2e/upgradecluster/Vagrantfile b/tests/e2e/upgradecluster/Vagrantfile index 6c63fae9b569..1bb0adc04c57 100644 --- a/tests/e2e/upgradecluster/Vagrantfile +++ b/tests/e2e/upgradecluster/Vagrantfile @@ -91,7 +91,16 @@ end def getDBType(role, role_num, vm) - if EXTERNAL_DB == "mysql" + if EXTERNAL_DB == "mariadb" + if role.include?("server") && role_num == 0 + dockerInstall(vm) + vm.provision "Start mariaDB", inline: "docker run -d -p 3306:3306 --name #{EXTERNAL_DB} -e MARIADB_ROOT_PASSWORD=e2e mariadb:11" + vm.provision "shell", inline: "echo \"Wait for mariaDB to startup\"; sleep 10" + return "datastore-endpoint: 'mysql://root:e2e@tcp(#{NETWORK_PREFIX}.100:3306)/k3s'" + elsif role.include?("server") && role_num != 0 + return "datastore-endpoint: 'mysql://root:e2e@tcp(#{NETWORK_PREFIX}.100:3306)/k3s'" + end + elsif EXTERNAL_DB == "mysql" if role.include?("server") && role_num == 0 dockerInstall(vm) vm.provision "Start mysql", inline: "docker run -d -p 3306:3306 --name #{EXTERNAL_DB} -e MYSQL_ROOT_PASSWORD=e2e mysql:5.7" diff --git a/tests/e2e/validatecluster/Vagrantfile b/tests/e2e/validatecluster/Vagrantfile index 80d99d67afdb..d8e588096aa8 100644 --- a/tests/e2e/validatecluster/Vagrantfile +++ b/tests/e2e/validatecluster/Vagrantfile @@ -99,8 +99,18 @@ def provision(vm, role, role_num, node_num) end def getDBType(role, role_num, vm) - - if EXTERNAL_DB == "mysql" + + if EXTERNAL_DB == "mariadb" + if role.include?("server") && role_num == 0 + dockerInstall(vm) + vm.provision "Start mariaDB", inline: "docker run -d -p 3306:3306 --name #{EXTERNAL_DB} -e MARIADB_ROOT_PASSWORD=e2e mariadb:11" + vm.provision "shell", inline: "echo \"Wait for mariaDB to startup\"; sleep 10" + return "datastore-endpoint: 'mysql://root:e2e@tcp(#{NETWORK_PREFIX}.100:3306)/k3s'" + elsif role.include?("server") && role_num != 0 + return "datastore-endpoint: 'mysql://root:e2e@tcp(#{NETWORK_PREFIX}.100:3306)/k3s'" + end + + elsif EXTERNAL_DB == "mysql" if role.include?("server") && role_num == 0 dockerInstall(vm) vm.provision "Start mysql", inline: "docker run -d -p 3306:3306 --name #{EXTERNAL_DB} -e MYSQL_ROOT_PASSWORD=e2e mysql:5.7"