From 61b9bb93f14ef9d9ca211fbd5533536116e947fa Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Wed, 11 Dec 2024 13:47:09 +0100 Subject: [PATCH 1/2] Remove unneeded test dependencies AFAICS, these are not used anywhere --- tests/requirements.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 85a8c7309fa..9fa8cca79d5 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,12 +1,8 @@ -r ../requirements.txt ansible-lint==24.10.0 -apache-libcloud==3.8.0 -ara[server]==1.7.2 -dopy==0.3.7 +distlib==0.3.9 molecule==24.12.0 molecule-plugins[vagrant]==23.5.3 pytest-testinfra==10.1.1 python-vagrant==1.0.0 -tox==4.23.2 -tzdata==2024.2 yamllint==1.35.1 From b9e9364c50c68edca95d7bd236a166abc155d79b Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Wed, 11 Dec 2024 13:57:15 +0100 Subject: [PATCH 2/2] Remove ara support in CI We do not use it and it has some overhead. --- tests/scripts/testcases_cleanup.sh | 5 ----- tests/scripts/testcases_run.sh | 4 ---- 2 files changed, 9 deletions(-) diff --git a/tests/scripts/testcases_cleanup.sh b/tests/scripts/testcases_cleanup.sh index 19978449043..e6df033d9cc 100755 --- a/tests/scripts/testcases_cleanup.sh +++ b/tests/scripts/testcases_cleanup.sh @@ -2,8 +2,3 @@ set -euxo pipefail make -C tests delete-${CI_PLATFORM} -s - -if [ -d ~/.ara ] ; then - tar czvf ${CI_PROJECT_DIR}/cluster-dump/ara.tgz ~/.ara - rm -fr ~/.ara -fi diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh index 66eabcc8f4e..6d70b465a1a 100755 --- a/tests/scripts/testcases_run.sh +++ b/tests/scripts/testcases_run.sh @@ -23,13 +23,9 @@ if [ "${UPGRADE_TEST}" != "false" ]; then git checkout "${CI_COMMIT_SHA}" -- tests/ fi -# needed for ara not to complain -export TZ=UTC - export ANSIBLE_REMOTE_USER=$SSH_USER export ANSIBLE_BECOME=true export ANSIBLE_BECOME_USER=root -export ANSIBLE_CALLBACK_PLUGINS="$(python -m ara.setup.callback_plugins)" export ANSIBLE_INVENTORY=${CI_PROJECT_DIR}/inventory/sample/ make -C tests INVENTORY_DIR=${ANSIBLE_INVENTORY} create-${CI_PLATFORM} -s