Skip to content

Commit

Permalink
Merge pull request #11785 from VannTen/cleanup/tests_reqs
Browse files Browse the repository at this point in the history
Remove ara in CI + some cleanup
  • Loading branch information
k8s-ci-robot authored Dec 12, 2024
2 parents 1307b2f + b9e9364 commit 45847ce
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
6 changes: 1 addition & 5 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 0 additions & 5 deletions tests/scripts/testcases_cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions tests/scripts/testcases_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 45847ce

Please sign in to comment.