From 37f97bb0e5e55446886f95ef0c881257cefd127a Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Mon, 6 Apr 2020 11:35:28 +0200
Subject: [PATCH] change runner hostname matching, run all test for this branch
---
.gitlab-ci.yml | 4 ++++
src/helpers.py | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01f9528c..0e7ee4d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ tests (from scratch):
- master
- /^release.*$/
- develop
+ - lukas_issue095_tech_mlt-runner
variables:
FAILURE_THRESHOLD: 100
before_script:
@@ -62,6 +63,7 @@ coverage (from scratch):
- master
- /^release.*$/
- develop
+ - lukas_issue095_tech_mlt-runner
variables:
FAILURE_THRESHOLD: 50
COVERAGE_PASS_THRESHOLD: 80
@@ -93,6 +95,7 @@ tests (on GPU):
- master
- /^release.*$/
- develop
+ - lukas_issue095_tech_mlt-runner
variables:
FAILURE_THRESHOLD: 100
before_script:
@@ -120,6 +123,7 @@ coverage (on GPU):
- master
- /^release.*$/
- develop
+ - lukas_issue095_tech_mlt-runner
variables:
FAILURE_THRESHOLD: 50
COVERAGE_PASS_THRESHOLD: 80
diff --git a/src/helpers.py b/src/helpers.py
index 2589cfe8..2ab628d7 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -99,6 +99,7 @@ class TimeTracking(object):
def prepare_host(create_new=True, sampling="daily"):
hostname = socket.gethostname()
+ runner_regex = re.compile(r"runner-.*-project-2411-concurrent-\d+")
try:
user = os.getlogin()
except OSError:
@@ -113,7 +114,7 @@ def prepare_host(create_new=True, sampling="daily"):
path = f"/p/project/cjjsc42/{user}/DATA/toar_{sampling}/"
elif (len(hostname) > 2) and (hostname[:2] == "jw"):
path = f"/p/home/jusers/{user}/juwels/intelliaq/DATA/toar_{sampling}/"
- elif "runner-6HmDp9Qd-project-2411-concurrent" in hostname:
+ elif runner_regex.match(hostname) is not None:
path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
else:
raise OSError(f"unknown host '{hostname}'")
--
GitLab