Skip to content
Snippets Groups Projects
Commit abcb909c authored by Hannes Feldt's avatar Hannes Feldt
Browse files

Merge branch 'nomad' into 'L2SS-1340-deploy_monitoring_to_nomad'

# Conflicts:
#   .gitlab-ci.yml
#   infra/dev/config/nomad/client.hcl
#   infra/dev/main.hcl
#   infra/env.yaml
#   infra/jobs/station/Makefile
#   sbin/prepare_dev_env.sh
parents f75b0d19 882f2dcf
No related tags found
2 merge requests!751Resolve L2SS-1340 "Deploy monitoring to nomad",!685Resolve L2SS-1340 "Deploy monitoring to nomad"
...@@ -343,8 +343,8 @@ deploy_nomad: ...@@ -343,8 +343,8 @@ deploy_nomad:
name: hashicorp/levant name: hashicorp/levant
entrypoint: [ "" ] entrypoint: [ "" ]
when: manual when: manual
#rules: rules:
# - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
parallel: parallel:
matrix: matrix:
- STATION: - STATION:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment