From e36a3c51002f91037684c8aa115a784195bdd612 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 20 May 2020 14:38:37 +0200
Subject: [PATCH] [CI] Migrated xunit2junit from Singularity to Docker.
---
scripts/ci/jobs/checks.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/ci/jobs/checks.yml b/scripts/ci/jobs/checks.yml
index 70c84aa2381..83feb040d93 100644
--- a/scripts/ci/jobs/checks.yml
+++ b/scripts/ci/jobs/checks.yml
@@ -23,15 +23,16 @@ ctest results:
variables:
GIT_STRATEGY: none
tags:
- - singularity
+ - docker-shell
+ - ogs
needs:
- job: build linux
- job: build win
- job: build mac
script:
- - singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build/Tests/ctest.xml > build/ctest-junit.xml
- - singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build-win/Tests/ctest.xml > build-win/ctest-junit.xml
- - singularity run docker://$XUNIT_TO_JUNIT_IMAGE -s:./build-win/Tests/ctest.xml > build-mac/ctest-junit.xml
+ - docker run -v $PWD:/tmp $XUNIT_TO_JUNIT_IMAGE -s:/tmp/build/Tests/ctest.xml > ./build/ctest-junit.xml
+ - docker run -v $PWD:/tmp $XUNIT_TO_JUNIT_IMAGE -s:/tmp/build-win/Tests/ctest.xml > ./build-win/ctest-junit.xml
+ - docker run -v $PWD:/tmp $XUNIT_TO_JUNIT_IMAGE -s:/tmp/build-mac/Tests/ctest.xml > ./build-mac/ctest-junit.xml
artifacts:
expire_in: 1 week
reports:
--
GitLab