Commit 437afbe8 authored by David Schäfer's avatar David Schäfer
Browse files

Merge branch 'master' of https://git.ufz.de/rdm/pipelines/crns

parents 60c38d9b 4e9153d3
......@@ -3,9 +3,7 @@ variables:
stages:
- test
- config
- build
# - sync
test:
stage: test
......@@ -18,32 +16,6 @@ test:
- pytest tests/test.py
- snakemake -j1 --dry-run
config:
# propagate changes to the directories
# config and manual to the branch pipeline
stage: config
only:
refs:
- master
changes:
- config/*
- manual/*
before_script:
- apt -y update && apt -y install git
- git config user.email "runner@git.ufz.de"
- git config user.name "Gitlab Runner"
script:
- git fetch --all
- git checkout origin/pipeline
- git checkout origin/master -- config
- git checkout origin/master -- manual
- git commit -m 'merge config/manual updates' || true
# $CI_DEPLOY_TOKEN is personal (i.e. schaefed)
# access token stored in a CI/CD variable
- git push http://schaefed:${CI_DEPLOY_TOKEN}@git.ufz.de/rdm/pipelines/crns HEAD:pipeline
build:
# build and push the pipeline image
stage: build
......@@ -51,30 +23,9 @@ build:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
only:
- pipeline
- master
variables:
IMAGE_NAME: $CI_REGISTRY/rdm/pipelines/crns:latest
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $IMAGE_NAME
#sync:
# # propagate changes from the pipeline branch to master
# stage: sync
# only:
# refs:
# - pipeline
# before_script:
# - apt -y update && apt -y install git
# - git config user.email "runner@git.ufz.de"
# - git config user.name "Gitlab Runner"
# script:
# - git fetch --all
# - git checkout pipeline
# - git pull
# - git checkout master
# - git pull
# - git merge pipeline
# # $CI_DEPLOY_TOKEN is personal (i.e. schaefed)
# # access token stored in a CI/CD variable
# - git push http://schaefed:${CI_DEPLOY_TOKEN}@git.ufz.de/rdm/pipelines/crns HEAD:master
......@@ -4,19 +4,20 @@ configfile: "./config.yaml"
PATH = config["path"]
PROJECT_ID = config["project"]
LOGGER_IDS = config["loggers"]
wildcard_constraints:
logger_id="\d+"
def getLoggerConfig():
# CLI usage: '--config logger_id=1[,2,...]'
# CLI usage: '--config logger_id=1[,2,...]', only specify the root logger
all_ids = set(LOGGER_IDS.keys())
given_ids = config.get("logger_id", None)
if given_ids:
given_ids = set(str(given_ids).split(","))
given_ids = set(map(int, str(given_ids).split(",")))
else:
given_ids = all_ids
......
loggers:
956 : 1399 # Sensor 3 Sachsen
1488: 1489 # Sensor 04 Sachsen-Anhalt
1490: 1492 # Sensor 12 Brandenburg
1499: 1500 # Sensor 11 Sachsen-Anhalt
1501: 1502 # Sensor 01 Hohes Holz
1504: 1503 # Sensor 07 Grosses Bruch
1505: 1506 # Sensor 05 Hordorf
1507: 1508 # Sensor 08 Schmetterlingswiese
960 : None # Sensor 10 Olocau Valencia
# 1567: 1573 # Sensor 18 UFZ-Gelände Leipzig
Markdown is supported
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