From f3fda89df54ce54bca28249c71bdae55fc773cb8 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Fri, 1 Mar 2019 13:26:15 +0100
Subject: [PATCH] Wait for proper LE cert to get served
See #53
---
.gitignore | 1 +
.gitlab-ci.yml | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index d5caa96b2..625cf3967 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 4078e8263..fbd2dedaf 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}\$\")"
--
GitLab