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
Branches
Tags
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
This commit is part of merge request !138. Comments created here will be created in the context of that merge request.
......@@ -14,7 +14,10 @@ build:k8s-bot:
- build/cd/k8s-bot
.deploy: &deploy
image: bitnami/kubectl:latest
image:
name: bitnami/kubectl:latest
entrypoint: [""]
before_script:
- echo "override global before script"
variables:
......@@ -73,7 +76,9 @@ deploy:nightly:develop:
- if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == "mainline"
destroy:k8s:
image: bitnami/kubectl:latest
image:
name: bitnami/kubectl:latest
entrypoint: [""]
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
......@@ -85,4 +90,4 @@ destroy:k8s:
script:
- ./build/cd/k8s-bot
dependencies:
- build:k8s-bot
\ No newline at end of file
- build:k8s-bot
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment