From 0fc56ed3443de2f97e72efb1cdf7e2ccbd6b778c Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Wed, 26 Mar 2025 14:57:06 +0100
Subject: [PATCH] CI: fix terraform

- add default testcase
- fix ansible ssh connection
---
 .gitlab-ci/terraform.yml       | 2 ++
 tests/scripts/testcases_run.sh | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml
index d5e627cd9..97003a860 100644
--- a/.gitlab-ci/terraform.yml
+++ b/.gitlab-ci/terraform.yml
@@ -49,6 +49,8 @@ terraform_validate:
   only: [/^pr-.*$/]
   variables:
     ANSIBLE_INVENTORY_UNPARSED_FAILED: "true"
+    ANSIBLE_REMOTE_USER: ubuntu # the openstack terraform module does not handle custom user correctly
+    ANSIBLE_SSH_RETRIES: 15
     TF_VAR_ssh_user: $ANSIBLE_REMOTE_USER
     TF_VAR_cluster_name: $CI_JOB_ID
   script:
diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh
index b2668c168..a427c550b 100755
--- a/tests/scripts/testcases_run.sh
+++ b/tests/scripts/testcases_run.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 set -euxo pipefail
 
+if [[ -v TESTCASE ]]; then
+    TESTCASE_FILE=files/${TESTCASE}.yml
+else
+    TESTCASE_FILE=common_vars.yml
+    TESTCASE=default
+fi
+
 echo "TESTCASE is $TESTCASE"
 
 source tests/files/$TESTCASE || true
@@ -56,7 +63,7 @@ playbook=$1
 shift
 ansible-playbook \
     -e @tests/common_vars.yml \
-    -e @tests/files/${TESTCASE}.yml \
+    -e @tests/${TESTCASE_FILE} \
     -e local_release_dir=${PWD}/downloads \
     "$@" \
     ${playbook}