Skip to content
Snippets Groups Projects
Verified Commit 427695ad authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

change only: changes to rules: changes hoping that makes them work again

parent d34e17db
No related branches found
No related tags found
1 merge request!84Resolve "Run login app with Gunicorn"
Pipeline #11102 failed with stages
in 1 minute and 10 seconds
This commit is part of merge request !84. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 36 deletions
.gitlab-ci.yml
+ 36
− 36
View file @ 427695ad
...@@ -52,10 +52,10 @@ login: ...@@ -52,10 +52,10 @@ login:
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
before_script: before_script:
- ls -l ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile - ls -l ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile
only: rules:
changes: - changes:
- login/**/* - login/**/*
- login/* - login/*
# For full integration testing we need to build the full stack in CI/CD # For full integration testing we need to build the full stack in CI/CD
...@@ -79,9 +79,9 @@ postgres: ...@@ -79,9 +79,9 @@ postgres:
KANIKO_CONTEXT: ".gitlab/ci/postgres" KANIKO_CONTEXT: ".gitlab/ci/postgres"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: rules:
changes: - changes:
- .gitlab/ci/postgres/**/* - .gitlab/ci/postgres/**/*
# Build our own kratos image, which is based on upstream # Build our own kratos image, which is based on upstream
...@@ -92,9 +92,9 @@ kratos: ...@@ -92,9 +92,9 @@ kratos:
KANIKO_CONTEXT: ".gitlab/ci/kratos" KANIKO_CONTEXT: ".gitlab/ci/kratos"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: rules:
changes: - changes:
- .gitlab/ci/kratos/**/* - .gitlab/ci/kratos/**/*
# Build our own hydra image, which is based on upstream # Build our own hydra image, which is based on upstream
hydra: hydra:
...@@ -104,9 +104,9 @@ hydra: ...@@ -104,9 +104,9 @@ hydra:
KANIKO_CONTEXT: ".gitlab/ci/hydra" KANIKO_CONTEXT: ".gitlab/ci/hydra"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: rules:
changes: - changes:
- .gitlab/ci/hydra/**/* - .gitlab/ci/hydra/**/*
# A Fake SSO app to test the behaviour # A Fake SSO app to test the behaviour
sso_testapp: sso_testapp:
...@@ -115,9 +115,9 @@ sso_testapp: ...@@ -115,9 +115,9 @@ sso_testapp:
KANIKO_CONTEXT: "test/sso_testapp/" KANIKO_CONTEXT: "test/sso_testapp/"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: rules:
changes: - changes:
- test/sso_testapp/**/* - test/sso_testapp/**/*
# Image to test behaviour (web) # Image to test behaviour (web)
behave: behave:
...@@ -126,9 +126,9 @@ behave: ...@@ -126,9 +126,9 @@ behave:
KANIKO_CONTEXT: "test/behave" KANIKO_CONTEXT: "test/behave"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: rules:
changes: - changes:
- test/behave/* - test/behave/*
behave-integration: behave-integration:
stage: integration-test stage: integration-test
...@@ -214,11 +214,11 @@ behave-integration: ...@@ -214,11 +214,11 @@ behave-integration:
- test/integration_tests/test/behave/screenshots/ - test/integration_tests/test/behave/screenshots/
expire_in: 1 month expire_in: 1 month
when: on_failure when: on_failure
only: rules:
changes: - changes:
- .gitlab/ci/**/* - .gitlab/ci/**/*
- login/**/* - login/**/*
- login/* - login/*
pylint: pylint:
stage: build stage: build
...@@ -226,11 +226,11 @@ pylint: ...@@ -226,11 +226,11 @@ pylint:
KANIKO_CONTEXT: "test/lint/pylint" KANIKO_CONTEXT: "test/lint/pylint"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build extends: .kaniko_build
only: rules:
changes: - changes:
- test/lint/pylint/Dockerfile - test/lint/pylint/Dockerfile
- test/lint/pylint/requirements.txt - test/lint/pylint/requirements.txt
- .gitlab-ci.yml - .gitlab-ci.yml
pylint-lint: pylint-lint:
stage: lint stage: lint
...@@ -243,10 +243,10 @@ pylint-lint: ...@@ -243,10 +243,10 @@ pylint-lint:
# Run darker with --diff command. This will throw exit code 1 if there are # Run darker with --diff command. This will throw exit code 1 if there are
# lint errors, but a 0 if there are only formatting recommendations # lint errors, but a 0 if there are only formatting recommendations
- darker -i -L pylint --diff --revision remotes/origin/main . - darker -i -L pylint --diff --revision remotes/origin/main .
only: rules:
changes: - changes:
- test/lint/pylint/Dockerfile - test/lint/pylint/Dockerfile
- test/lint/pylint/requirements.txt - test/lint/pylint/requirements.txt
- .gitlab-ci.yml - .gitlab-ci.yml
- login/**/* - login/**/*
- login/* - login/*
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment