From ceb6cf7e8a2df3ddbca92802aa9fde227bf40ae5 Mon Sep 17 00:00:00 2001
From: Mart van Santen <mart@greenhost.nl>
Date: Thu, 25 Nov 2021 08:47:17 +0100
Subject: [PATCH] Work on integration tests
---
.gitlab-ci.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97b4324..aa5faa0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,6 +97,8 @@ behave-integration:
services:
- name: postgres:latest
alias: postgres
+ - name: docker.io/oryd/kratos:latest
+ alias: kratos
- name: docker.io/oryd/hydra:v1.10.7-alpine
alias: hydra
command:
@@ -104,8 +106,8 @@ behave-integration:
- all
- --dangerous-force-http
- --dangerous-allow-insecure-redirect-urls
- - "http://oidc:5000/callback"
- - name: ${CI_REGISTRY_IMAGE}/integration_test_app:${CI_COMMIT_REF_NAME}
+ - "http://oidc:5000/login/"
+ - name: ${CI_REGISTRY_IMAGE}/login:${CI_COMMIT_REF_NAME}
alias: oidc
variables:
# Feature Flag FF_NETWORK_PER_BUILD Enables creation of a docker network per build
@@ -143,9 +145,10 @@ behave-integration:
SECRET: "secret"
DEBUG: "true"
FLASK_ENV: "development"
- image: ${CI_REGISTRY_IMAGE}/integration_test:${CI_COMMIT_REF_NAME}
+ image: ${CI_REGISTRY_IMAGE}/login:${CI_COMMIT_REF_NAME}
script:
- echo "I am skipped today!"
+ - curl http://oidc:5000/whoami
# Create user and application objects
#- /bin/bash user-panel/backend/utils/create-user.bash ${TESTUSER_USERNAME} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL} backend:5000
#- /bin/bash user-panel/backend/utils/create-user.bash ${TESTUSER_USERNAME2} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL2} backend:5000
--
GitLab