From 11b07f32e8c308b4bf39cc2ff77b4bbcf428db31 Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Mon, 6 Apr 2020 13:45:44 +0200
Subject: [PATCH] fix for not concurrent runners
---
.gitlab-ci.yml | 32 --------------------------------
src/helpers.py | 2 +-
2 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93b28dd9..32cdebee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,38 +55,6 @@ tests (from scratch):
- badges/
- test_results/
-coverage (from scratch):
- tags:
- - base
- - zam347
- stage: test
- only:
- - master
- - /^release.*$/
- - develop
- - lukas_issue095_tech_mlt-runner
- variables:
- FAILURE_THRESHOLD: 50
- COVERAGE_PASS_THRESHOLD: 80
- TEST_TYPE: "scratch"
- before_script:
- - chmod +x ./CI/update_badge.sh
- - ./CI/update_badge.sh > /dev/null
- script:
- - zypper --non-interactive install binutils libproj-devel gdal-devel
- - zypper --non-interactive install proj geos-devel
- - pip install -r requirements.txt
- - chmod +x ./CI/run_pytest_coverage.sh
- - ./CI/run_pytest_coverage.sh
- after_script:
- - ./CI/update_badge.sh > /dev/null
- artifacts:
- name: pages
- when: always
- paths:
- - badges/
- - coverage/
-
### Tests (on GPU) ###
tests (on GPU):
tags:
diff --git a/src/helpers.py b/src/helpers.py
index 2ab628d7..4289e9f5 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -99,7 +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+")
+ runner_regex = re.compile(r"runner-.*-project-2411-concurrent-?\d+")
try:
user = os.getlogin()
except OSError:
--
GitLab