diff --git a/ansible.cfg b/ansible.cfg index c17fe48fdcd854e5dd4b9a7f34e9164a2d28b466..79c2bc56c29345947af9e73d7a650e393b755451 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -14,7 +14,7 @@ fact_caching_timeout = 7200 stdout_callback = default display_skipped_hosts = no library = ./library -callback_whitelist = profile_tasks +callback_whitelist = profile_tasks,ara_default roles_path = roles:$VIRTUAL_ENV/usr/local/share/kubespray/roles:$VIRTUAL_ENV/usr/local/share/ansible/roles:/usr/share/kubespray/roles deprecation_warnings=False inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo, .creds, .gpg diff --git a/tests/requirements-2.10.txt b/tests/requirements-2.10.txt index a80c3a868388a939741d3284ba4ecdda259f1415..e139e1fa6b1ff59bd77cf8eafb452dfc5b2bb1c1 100644 --- a/tests/requirements-2.10.txt +++ b/tests/requirements-2.10.txt @@ -10,3 +10,4 @@ molecule==3.0.6 molecule-vagrant==0.3 testinfra==5.2.2 python-vagrant==0.5.15 +ara[server]==1.5.7 diff --git a/tests/requirements-2.11.txt b/tests/requirements-2.11.txt index 8ad98b8b448a7acc9dc742fab0e4b3bc7d9714fd..b58e0f2c13584b78fcbb2b5e4b2b8ffbf987abe9 100644 --- a/tests/requirements-2.11.txt +++ b/tests/requirements-2.11.txt @@ -10,3 +10,4 @@ molecule==3.0.6 molecule-vagrant==0.3 testinfra==5.2.2 python-vagrant==0.5.15 +ara[server]==1.5.7 diff --git a/tests/requirements-2.9.txt b/tests/requirements-2.9.txt index 1feb6150c03088eee525e2e18ce4d9316e202446..9ae13b5b261f835f316aa7794d7aba4f6e1d58e9 100644 --- a/tests/requirements-2.9.txt +++ b/tests/requirements-2.9.txt @@ -13,3 +13,4 @@ molecule-vagrant==0.3 testinfra==5.2.2 ; python_version >= '3.0' testinfra==3.4.0 ; python_version < '3.0' python-vagrant==0.5.15 +ara[server]==1.5.7 diff --git a/tests/scripts/testcases_cleanup.sh b/tests/scripts/testcases_cleanup.sh index 0e1d0f27f82a9b810b62604dc70946f68d9654a6..71b7fdc5b1665bffeec60add8dd0592ca560ad58 100755 --- a/tests/scripts/testcases_cleanup.sh +++ b/tests/scripts/testcases_cleanup.sh @@ -2,3 +2,8 @@ set -euxo pipefail cd tests && make delete-${CI_PLATFORM} -s ; cd - + +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 2e02103a266da4a439c8ece8f3b854e3b1d5a0e9..ed16b24d0e8953911931dac1913e2567a83f3baf 100755 --- a/tests/scripts/testcases_run.sh +++ b/tests/scripts/testcases_run.sh @@ -16,10 +16,13 @@ else fi 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)" cd tests && make create-${CI_PLATFORM} -s ; cd - ansible-playbook tests/cloud_playbooks/wait-for-ssh.yml