From 66d2219c1361b528179595af0b95cd757bab0c15 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Fri, 1 Mar 2019 15:09:31 +0100
Subject: [PATCH] Install curl in CI test image
---
.gitlab-ci.yml | 3 +--
test/Dockerfile | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3abad278..b1ceb6caa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,8 +46,7 @@ bootstrap:
# 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'
+ - 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)
diff --git a/test/Dockerfile b/test/Dockerfile
index 737daaa0b..5567b7fe4 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -6,6 +6,7 @@ LABEL vendor1="Greenhost"
RUN apk --no-cache add \
ansible \
+ curl \
musl-dev \
linux-headers \
gcc \
--
GitLab