diff --git a/.gitignore b/.gitignore index d5caa96b23c0f51cb23010aa80bd0d91f93262ba..625cf3967d28477f527e0a06f30bf5d3ff87201a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ # Ignore files created by ansible-playbook *.retry /ansible/secrets/ +ansible/rke.log # Ignore files created during CI using test/ci-bootstrap.py /test/group_vars/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4078e82632804ee386935e842500424306392c1d..fbd2dedaf2bbf0295189b76f9f47f3f895649b24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,10 +45,12 @@ bootstrap: - ANSIBLE_HOST_KEY_CHECKING=False python3 -u ./ci-bootstrap.py --create_droplet # Run testinfra tests - py.test -v --ansible-inventory=./inventory.yml --connection=ssh --hosts='ansible://*' + # Wait for proper LE cert to get served + # - sh -c 'while curl -s https://auth.ci-${CI_JOB_ID}.ci.openappstack.net/auth/>/dev/null ; do echo "$(date): Waiting for LE cert..."; sleep 5 ; done' + - sh -c 'while curl -s https://auth.ci-${CI_JOB_ID}.ci.openappstack.net/auth/>/dev/null; do date; echo "Waiting for LE cert..."; sleep 5; done' # Run behave tests - cd behave/ - - behave -D keycloak.admin.url=https://auth.ci-${CI_JOB_ID}.ci.openappstack.net/auth/admin/master/console/ - -D keycloak.admin.password=$(cat ../secrets/keycloak_admin_password) + - behave -D keycloak.admin.url=https://auth.ci-${CI_JOB_ID}.ci.openappstack.net/auth/admin/master/console/ -D keycloak.admin.password=$(cat ../secrets/keycloak_admin_password) # Remove droplet after successful tests - cd .. - python3 -c "import cosmos; cosmos.terminate_droplets_by_name(\"^ci-${CI_JOB_ID}\$\")"