Skip to content
Snippets Groups Projects
Commit 4120ca65 authored by Mart van Santen's avatar Mart van Santen
Browse files

COrrected paths

parent 5c4a32b4
No related branches found
No related tags found
2 merge requests!68Merge loginpanel into main and release 0.5.0,!57Resolve "Add login panel CI/CD to create (docker) image"
Pipeline #9977 failed
...@@ -2,7 +2,7 @@ include: ...@@ -2,7 +2,7 @@ include:
- remote: https://open.greenhost.net/stackspin/stackspin/raw/main/.gitlab/ci_templates/kaniko.yml - remote: https://open.greenhost.net/stackspin/stackspin/raw/main/.gitlab/ci_templates/kaniko.yml
stages: stages:
- build #- build
- build-test-images - build-test-images
# TODO: Re-enable after fixing #82 # TODO: Re-enable after fixing #82
# - lint # - lint
...@@ -48,27 +48,27 @@ login: ...@@ -48,27 +48,27 @@ login:
# A Fake SSO app to test the behaviour # A Fake SSO app to test the behaviour
ssotest_app: sso_testapp:
stage: build-test-images stage: build-test-images
variables: variables:
KANIKO_CONTEXT: "test/ssotest_app" KANIKO_CONTEXT: "test/sso_testapp/"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: only:
changes: changes:
- test/ssotest_app/**/* - test/sso_testapp/**/*
- .gitlab-ci.yml - .gitlab-ci.yml
# Webbrowser tests # Webbrowser tests
behave_test: behave:
stage: build-test-images stage: build-test-images
variables: variables:
KANIKO_CONTEXT: "test/behave_test" KANIKO_CONTEXT: "test/behave"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: only:
changes: changes:
- test/behave_test/**/* - test/behave/**/*
- .gitlab-ci.yml - .gitlab-ci.yml
#pylint: #pylint:
...@@ -150,7 +150,7 @@ behave-integration: ...@@ -150,7 +150,7 @@ behave-integration:
- http://oidc:5000/login - http://oidc:5000/login
- name: ${CI_REGISTRY_IMAGE}/login:${CI_COMMIT_REF_NAME} - name: ${CI_REGISTRY_IMAGE}/login:${CI_COMMIT_REF_NAME}
alias: oidc alias: oidc
- name: ${CI_REGISTRY_IMAGE}/test/ssotest_app:${CI_COMMIT_REF_NAME} - name: ${CI_REGISTRY_IMAGE}/test/sso_testapp:${CI_COMMIT_REF_NAME}
alias: ssoapp alias: ssoapp
variables: variables:
# Feature Flag FF_NETWORK_PER_BUILD Enables creation of a docker network per build # Feature Flag FF_NETWORK_PER_BUILD Enables creation of a docker network per build
...@@ -200,7 +200,7 @@ behave-integration: ...@@ -200,7 +200,7 @@ behave-integration:
OAUTHLIB_INSECURE_TRANSPORT: "true" OAUTHLIB_INSECURE_TRANSPORT: "true"
KEY: "testapp" KEY: "testapp"
SECRET: "secret" SECRET: "secret"
image: ${CI_REGISTRY_IMAGE}/test/behave_test:${CI_COMMIT_REF_NAME} image: ${CI_REGISTRY_IMAGE}/test/behave:${CI_COMMIT_REF_NAME}
script: script:
- curl http://kratos:4433/health/alive - curl http://kratos:4433/health/alive
- curl http://oidc:5000/whoami - curl http://oidc:5000/whoami
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment