Skip to content
Snippets Groups Projects
Commit 6a993573 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

Merge branch 'develop' into thesis-manu

parents 5fb6dad5 04be6a1d
No related branches found
No related tags found
8 merge requests!246Develop,!245Develop into Master,!244Master into develop2 into master,!219Draft: Testing,!214Test pipelines,!195DO NOT MERGE 2,!194DO NOT MERGE! just for testing,!138Develop
...@@ -14,7 +14,10 @@ build:k8s-bot: ...@@ -14,7 +14,10 @@ build:k8s-bot:
- build/cd/k8s-bot - build/cd/k8s-bot
.deploy: &deploy .deploy: &deploy
image: bitnami/kubectl:latest image:
name: bitnami/kubectl:latest
entrypoint: [""]
before_script: before_script:
- echo "override global before script" - echo "override global before script"
variables: variables:
...@@ -73,7 +76,9 @@ deploy:nightly:develop: ...@@ -73,7 +76,9 @@ deploy:nightly:develop:
- if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == "mainline" - if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == "mainline"
destroy:k8s: destroy:k8s:
image: bitnami/kubectl:latest image:
name: bitnami/kubectl:latest
entrypoint: [""]
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always when: always
...@@ -85,4 +90,4 @@ destroy:k8s: ...@@ -85,4 +90,4 @@ destroy:k8s:
script: script:
- ./build/cd/k8s-bot - ./build/cd/k8s-bot
dependencies: dependencies:
- build:k8s-bot - build:k8s-bot
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment