Browse Source

CI: directly use ANSIBLE_VERBOSITY instead of tweaking command line

https://docs.ansible.com/ansible/latest/reference_appendices/config.html#envvar-ANSIBLE_VERBOSITY
pull/11530/head
Max Gautier 6 months ago
parent
commit
236a7486f4
Failed to extract signature
3 changed files with 1 additions and 3 deletions
  1. 2
      .gitlab-ci.yml
  2. 1
      tests/Makefile
  3. 1
      tests/scripts/testcases_run.sh

2
.gitlab-ci.yml

@ -23,7 +23,7 @@ variables:
REMOVE_NODE_CHECK: "false" REMOVE_NODE_CHECK: "false"
UPGRADE_TEST: "false" UPGRADE_TEST: "false"
MITOGEN_ENABLE: "false" MITOGEN_ENABLE: "false"
ANSIBLE_LOG_LEVEL: "-vv"
ANSIBLE_VERBOSITY: 2
RECOVER_CONTROL_PLANE_TEST: "false" RECOVER_CONTROL_PLANE_TEST: "false"
RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:]:kube_control_plane[1:]" RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:]:kube_control_plane[1:]"
TERRAFORM_VERSION: 1.3.7 TERRAFORM_VERSION: 1.3.7

1
tests/Makefile

@ -11,7 +11,6 @@ delete-tf:
create-packet: init-packet create-packet: init-packet
ansible-playbook cloud_playbooks/create-packet.yml -c local \ ansible-playbook cloud_playbooks/create-packet.yml -c local \
$(ANSIBLE_LOG_LEVEL) \
-e @"files/${CI_JOB_NAME}.yml" \ -e @"files/${CI_JOB_NAME}.yml" \
-e test_name="$(subst .,-,$(CI_PIPELINE_ID)-$(CI_JOB_ID))" \ -e test_name="$(subst .,-,$(CI_PIPELINE_ID)-$(CI_JOB_ID))" \
-e branch="$(CI_COMMIT_BRANCH)" \ -e branch="$(CI_COMMIT_BRANCH)" \

1
tests/scripts/testcases_run.sh

@ -55,7 +55,6 @@ playbook=$1
shift shift
# We can set --limit here and still pass it as supplemental args because `--limit` is a 'last one wins' option # We can set --limit here and still pass it as supplemental args because `--limit` is a 'last one wins' option
ansible-playbook \ ansible-playbook \
$ANSIBLE_LOG_LEVEL \
-e @tests/common_vars.yml \ -e @tests/common_vars.yml \
-e @tests/files/${CI_JOB_NAME}.yml \ -e @tests/files/${CI_JOB_NAME}.yml \
-e local_release_dir=${PWD}/downloads \ -e local_release_dir=${PWD}/downloads \

Loading…
Cancel
Save