Merge pull request #1093 from Nordix/enable-mariadb-backport-moshiur

🐛Manual back port enabling mariadb instead of SQLite for release-1.4

Author: metal3-io-bot

scripts/ci-e2e.sh

@@ -21,12 +21,14 @@ M3_DEV_ENV_PATH="${M3_DEV_ENV_PATH:-${WORKING_DIR}/metal3-dev-env}"
 clone_repo "${M3_DEV_ENV_REPO}" "${M3_DEV_ENV_BRANCH}" "${M3_DEV_ENV_PATH}"
 
 # Config devenv
+# Enabling Mariadb instead of SQLite. This can be set to false once SQLite issue is resolved
 cat <<-EOF > "${M3_DEV_ENV_PATH}/config_${USER}.sh"
 export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"}
 export CAPM3_VERSION=${CAPM3_VERSION:-"v1beta1"}
 export NUM_NODES=${NUM_NODES:-"4"}
 export KUBERNETES_VERSION=${FROM_K8S_VERSION}
 export IMAGE_OS=${IMAGE_OS}
+export IRONIC_USE_MARIADB="true"
 export FORCE_REPO_UPDATE="false"
 EOF
 

test/e2e/config/e2e_conf.yaml

@@ -123,7 +123,8 @@ variables:
   IRONIC_TLS_SETUP: "true"
   IRONIC_BASIC_AUTH: "true"
   IRONIC_KEEPALIVED: "true"
-  IRONIC_USE_MARIADB: "false"
+  # Enabling Mariadb instead of SQLite. This can be set to false once SQLite issue is resolved
+  IRONIC_USE_MARIADB: "true"
   RESTART_CONTAINER_CERTIFICATE_UPDATED: "true"
   CONTAINER_REGISTRY: "${CONTAINER_REGISTRY:-quay.io}"
   DOCKER_HUB_PROXY: "${DOCKER_HUB_PROXY:-docker.io}"