From 76b94bb8942ac93b967a7879679a47c36d6e7e39 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 26 May 2020 09:49:09 +0200 Subject: [PATCH] test --- .gitlab-ci.yml | 50 ++++++++++++------------ CI/gitlab-ci/linux-template-test-job.yml | 6 +-- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6dc203d..4e128439 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,9 +63,9 @@ test-debug-gcc-cpp11: artifacts: reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-gcc-cpp11-debug-Vector-Checks/Unittests/report.xml + build-gcc-cpp11-debug-Vector-Checks/Unittests/report-customvec.xml + build-gcc-cpp11-debug-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -99,9 +99,9 @@ test-release-gcc-cpp11: artifacts: reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-gcc-cpp11-release-Vector-Checks/Unittests/report.xml + build-gcc-cpp11-release-Vector-Checks/Unittests/report-customvec.xml + build-gcc-cpp11-release-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -135,9 +135,9 @@ test-debug-clang-cpp11: artifacts: reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-clang-cpp11-debug-Vector-Checks/Unittests/report.xml + build-clang-cpp11-debug-Vector-Checks/Unittests/report-customvec.xml + build-clang-cpp11-debug-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -171,9 +171,9 @@ test-release-clang-cpp11: artifacts: reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-clang-cpp11-release-Vector-Checks/Unittests/report.xml + build-clang-cpp11-release-Vector-Checks/Unittests/report-customvec.xml + build-clang-cpp11-release-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -207,9 +207,9 @@ test-debug-gcc-cpp14: artifacts: reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-gcc-cpp14-debug-Vector-Checks/Unittests/report.xml + build-gcc-cpp14-debug-Vector-Checks/Unittests/report-customvec.xml + build-gcc-cpp14-debug-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -243,9 +243,9 @@ test-release-gcc-cpp14: artifacts: reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-gcc-cpp14-release-Vector-Checks/Unittests/report.xml + build-gcc-cpp14-release-Vector-Checks/Unittests/report-customvec.xml + build-gcc-cpp14-release-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -279,9 +279,9 @@ test-debug-clang-cpp14: artifacts: reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-clang-cpp14-debug-Vector-Checks/Unittests/report.xml + build-clang-cpp14-debug-Vector-Checks/Unittests/report-customvec.xml + build-clang-cpp14-debug-Vector-Checks/Unittests/report-doublevec.xml #----------- Job Informations: @@ -313,13 +313,11 @@ test-release-clang-cpp14: dependencies: [build-release-clang-cpp14] needs: [build-release-clang-cpp14] artifacts: - paths: - - ./* reports: junit: - report.xml - report-customvec.xml - report-doublevec.xml + build-clang-cpp14-release-Vector-Checks/Unittests/report.xml + build-clang-cpp14-release-Vector-Checks/Unittests/report-customvec.xml + build-clang-cpp14-release-Vector-Checks/Unittests/report-doublevec.xml diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index c1c35cda..dba1864a 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -14,7 +14,7 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: artifacts: reports: junit: - */Unittests/report.xml - */Unittests/report-customvec.xml - */Unittests/report-doublevec.xml + build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report.xml + build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report-customvec.xml + build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests/report-doublevec.xml