From 236a7486f40e1bcc7d0fb143d0d8ca0945d3039f Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 4 Nov 2024 13:18:04 +0100
Subject: [PATCH] CI: directly use ANSIBLE_VERBOSITY instead of tweaking
command line
https://docs.ansible.com/ansible/latest/reference_appendices/config.html#envvar-ANSIBLE_VERBOSITY
---
.gitlab-ci.yml | 2 +-
tests/Makefile | 1 -
tests/scripts/testcases_run.sh | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2eaa8f046..e2b8864f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
REMOVE_NODE_CHECK: "false"
UPGRADE_TEST: "false"
MITOGEN_ENABLE: "false"
- ANSIBLE_LOG_LEVEL: "-vv"
+ ANSIBLE_VERBOSITY: 2
RECOVER_CONTROL_PLANE_TEST: "false"
RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:]:kube_control_plane[1:]"
TERRAFORM_VERSION: 1.3.7
diff --git a/tests/Makefile b/tests/Makefile
index 33e0e9dcb..8a275f1dc 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,7 +11,6 @@ delete-tf:
create-packet: init-packet
ansible-playbook cloud_playbooks/create-packet.yml -c local \
- $(ANSIBLE_LOG_LEVEL) \
-e @"files/${CI_JOB_NAME}.yml" \
-e test_name="$(subst .,-,$(CI_PIPELINE_ID)-$(CI_JOB_ID))" \
-e branch="$(CI_COMMIT_BRANCH)" \
diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh
index 81632eeee..66eabcc8f 100755
--- a/tests/scripts/testcases_run.sh
+++ b/tests/scripts/testcases_run.sh
@@ -55,7 +55,6 @@ playbook=$1
shift
# We can set --limit here and still pass it as supplemental args because `--limit` is a 'last one wins' option
ansible-playbook \
- $ANSIBLE_LOG_LEVEL \
-e @tests/common_vars.yml \
-e @tests/files/${CI_JOB_NAME}.yml \
-e local_release_dir=${PWD}/downloads \
--
GitLab