Add MariaDB to E2E (#10724)

* add mariadb to Validate and Upgrade E2E tests Signed-off-by: robertsilen <robert.silen@iki.fi> Signed-off-by: Robert Silén <robert.silen@iki.fi> Co-authored-by: Derek Nola <derek.nola@suse.com>

Add MariaDB to E2E (#10724)
40eda6a8 · Robert Silén · GitHub · 7d66fa7f · 40eda6a8 · 40eda6a8
Unverified Commit 40eda6a8 authored Sep 19, 2024 by Robert Silén Committed by GitHub Sep 19, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 3 deletions

Vagrantfile tests/e2e/upgradecluster/Vagrantfile +10 -1

Vagrantfile tests/e2e/validatecluster/Vagrantfile +12 -2

No files found.
--- 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"

--- 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"