Merge branch 'main' into otel_test

Author: sheltoncyril

tests/model_explainability/trustyai_service/conftest.py

@@ -208,6 +208,11 @@ def mariadb(
     mariadb_dict["spec"]["username"] = DB_USERNAME
 
     mariadb_dict["spec"]["replicas"] = 1
+
+    # Need to fix MariaDB version due to an issue with the default version in certain environments
+    # Using the same registry and image used by the MariaDB operator
+    # --just changing the tag to point to a stable version
+    mariadb_dict["spec"]["image"] = "docker-registry1.mariadb.com/library/mariadb:10.11.8"
     mariadb_dict["spec"]["galera"]["enabled"] = False
     mariadb_dict["spec"]["metrics"]["enabled"] = False
     mariadb_dict["spec"]["tls"] = {"enabled": True, "required": True}