Commit 04df45a7 authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'fix_testupload' into 'master'

CI: Fix Uploading of Test Results

See merge request allpix-squared/allpix-squared!579
parents 211ab5f0 35d1b399
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ fmt:coverity:
.test:
    stage: testing
    after_script:
        - ./.gitlab/ci/transform_ctest_junit.py build/Testing/`head -n 1 build/Testing/TAG`/Test.xml .gitlab/ci/ctest-to-junit.xsl apsq-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}.xml
        - source .ci/init_x86_64.sh
        - .gitlab/ci/transform_ctest_junit.py build/Testing/`head -n 1 build/Testing/TAG`/Test.xml .gitlab/ci/ctest-to-junit.xsl apsq-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}.xml
    artifacts:
        when: always
        expire_in: 1 week
@@ -257,7 +258,7 @@ core:lxplus-gcc:
        - job: cmp:lxplus-gcc
          artifacts: true

# Ubuntu Docker image
# Ubuntu Docker image - overriding after_script to not load CVMFS
mod:docker:
    extends:
        - .docker
@@ -265,6 +266,8 @@ mod:docker:
    needs:
        - job: cmp:docker
          artifacts: true
    after_script:
        - .gitlab/ci/transform_ctest_junit.py build/Testing/`head -n 1 build/Testing/TAG`/Test.xml .gitlab/ci/ctest-to-junit.xsl apsq-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}.xml

core:docker:
    extends:
@@ -273,6 +276,8 @@ core:docker:
    needs:
        - job: cmp:docker
          artifacts: true
    after_script:
        - .gitlab/ci/transform_ctest_junit.py build/Testing/`head -n 1 build/Testing/TAG`/Test.xml .gitlab/ci/ctest-to-junit.xsl apsq-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}.xml

# CentOS 7
mod:cc7-gcc: