Browse Source
CI: fix terraform
- add default testcase
- fix ansible ssh connection
pull/12037/head
Max Gautier
1 month ago
Failed to extract signature
2 changed files with
10 additions and
1 deletions
-
.gitlab-ci/terraform.yml
-
tests/scripts/testcases_run.sh
|
|
@ -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: |
|
|
|
|
|
@ -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} |
|
|
|