From 943e846e732c5d2e69e8c224a584df28ae4d386c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 25 May 2020 07:16:41 +0200 Subject: [PATCH 01/12] Try to show test results in gitlab --- .gitlab-ci.yml | 80 ++++++++++++++++++++++++ CI/ci-linux-test.sh | 8 +-- CI/gitlab-ci/linux-template-test-job.yml | 10 +++ 3 files changed, 94 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75ed8497..969706e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,6 +59,16 @@ test-debug-gcc-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-gcc-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -87,6 +97,16 @@ test-release-gcc-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-gcc-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: debug @@ -115,6 +135,16 @@ test-debug-clang-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-clang-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -143,6 +173,16 @@ test-release-clang-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-clang-cpp11] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: debug @@ -171,6 +211,16 @@ test-debug-gcc-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-gcc-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -199,6 +249,16 @@ test-release-gcc-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-gcc-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: debug @@ -227,6 +287,16 @@ test-debug-clang-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-clang-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + #----------- Job Informations: # Type: Build: release @@ -255,6 +325,16 @@ test-release-clang-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-clang-cpp14] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + # ----------------- diff --git a/CI/ci-linux-test.sh b/CI/ci-linux-test.sh index 0c0cbc9f..a898cfed 100755 --- a/CI/ci-linux-test.sh +++ b/CI/ci-linux-test.sh @@ -42,7 +42,7 @@ echo -e "${NC}" cd Unittests #execute tests -./unittests --gtest_color=yes --gtest_output=xml +./unittests --gtest_color=yes --gtest_output="xml:report.xml" echo -e "${OUTPUT}" echo "" @@ -51,7 +51,7 @@ echo "Running unittests $BUILD_TYPE version with custom vector type" echo "======================================================================" echo -e "${NC}" -./unittests_customvec --gtest_color=yes --gtest_output=xml +./unittests_customvec --gtest_color=yes --gtest_output="xml:report-customvec.xml" echo -e "${OUTPUT}" echo "" @@ -61,7 +61,7 @@ echo "======================================================================" echo -e "${NC}" #execute tests -./unittests_doublevec --gtest_color=yes --gtest_output=xml +./unittests_doublevec --gtest_color=yes --gtest_output="xml:report-doublevec.xml" cd .. -cd .. \ No newline at end of file +cd .. diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index b8eca4b6..b199f04b 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -10,3 +10,13 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] + artifacts: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + reports: + junit: + Unittests/report.xml + Unittests/report-customvec.xml + Unittests/report-doublevec.xml + From 8a1aaa8472b1d9c5e33436d8ad96ad1583015415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 25 May 2020 07:18:27 +0200 Subject: [PATCH 02/12] Try to show test results in gitlab --- .gitlab-ci.yml | 56 +++++++----------------- CI/gitlab-ci/linux-template-test-job.yml | 7 +-- 2 files changed, 18 insertions(+), 45 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 969706e7..a49f440b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,11 +60,8 @@ test-debug-gcc-cpp11: tags: [Docker] dependencies: [build-debug-gcc-cpp11] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml @@ -98,11 +95,8 @@ test-release-gcc-cpp11: tags: [Docker] dependencies: [build-release-gcc-cpp11] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml @@ -136,11 +130,8 @@ test-debug-clang-cpp11: tags: [Docker] dependencies: [build-debug-clang-cpp11] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml @@ -174,11 +165,8 @@ test-release-clang-cpp11: tags: [Docker] dependencies: [build-release-clang-cpp11] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml @@ -212,11 +200,8 @@ test-debug-gcc-cpp14: tags: [Docker] dependencies: [build-debug-gcc-cpp14] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml @@ -250,11 +235,8 @@ test-release-gcc-cpp14: tags: [Docker] dependencies: [build-release-gcc-cpp14] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml @@ -288,11 +270,8 @@ test-debug-clang-cpp14: tags: [Docker] dependencies: [build-debug-clang-cpp14] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml @@ -326,11 +305,8 @@ test-release-clang-cpp14: tags: [Docker] dependencies: [build-release-clang-cpp14] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml 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 b199f04b..70a88705 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -11,11 +11,8 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: tags: [Docker] dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] artifacts: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml - reports: - junit: + reports: + junit: Unittests/report.xml Unittests/report-customvec.xml Unittests/report-doublevec.xml From df88262f41e2f9eaac19f3df64f024f970b0be9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 25 May 2020 10:14:48 +0200 Subject: [PATCH 03/12] Next try --- .gitlab-ci.yml | 48 ++++++++++++------------ CI/gitlab-ci/linux-template-test-job.yml | 6 +-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a49f440b..71a0bdcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,9 +62,9 @@ test-debug-gcc-cpp11: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml #----------- Job Informations: @@ -97,9 +97,9 @@ test-release-gcc-cpp11: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml #----------- Job Informations: @@ -132,9 +132,9 @@ test-debug-clang-cpp11: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml #----------- Job Informations: @@ -167,9 +167,9 @@ test-release-clang-cpp11: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml #----------- Job Informations: @@ -202,9 +202,9 @@ test-debug-gcc-cpp14: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml #----------- Job Informations: @@ -237,9 +237,9 @@ test-release-gcc-cpp14: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml #----------- Job Informations: @@ -272,9 +272,9 @@ test-debug-clang-cpp14: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml #----------- Job Informations: @@ -307,9 +307,9 @@ test-release-clang-cpp14: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index 70a88705..fbcd709e 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -13,7 +13,7 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: artifacts: reports: junit: - Unittests/report.xml - Unittests/report-customvec.xml - Unittests/report-doublevec.xml + report.xml + report-customvec.xml + report-doublevec.xml From c818971423332fab063c157bc0ff8dc2789589dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 25 May 2020 11:55:34 +0200 Subject: [PATCH 04/12] Next try --- .gitlab-ci.yml | 25 ++++++++++++++++-------- CI/gitlab-ci/linux-template-test-job.yml | 3 ++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71a0bdcb..fd5effa4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,8 @@ test-debug-gcc-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-gcc-cpp11] - artifacts: + needs: [build-debug-gcc-cpp11] + artifacts: reports: junit: report.xml @@ -94,7 +95,8 @@ test-release-gcc-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-gcc-cpp11] - artifacts: + needs: [build-release-gcc-cpp11] + artifacts: reports: junit: report.xml @@ -129,7 +131,8 @@ test-debug-clang-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-clang-cpp11] - artifacts: + needs: [build-debug-clang-cpp11] + artifacts: reports: junit: report.xml @@ -164,7 +167,8 @@ test-release-clang-cpp11: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-clang-cpp11] - artifacts: + needs: [build-release-clang-cpp11] + artifacts: reports: junit: report.xml @@ -199,7 +203,8 @@ test-debug-gcc-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-gcc-cpp14] - artifacts: + needs: [build-debug-gcc-cpp14] + artifacts: reports: junit: report.xml @@ -234,7 +239,8 @@ test-release-gcc-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-gcc-cpp14] - artifacts: + needs: [build-release-gcc-cpp14] + artifacts: reports: junit: report.xml @@ -269,7 +275,8 @@ test-debug-clang-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-debug-clang-cpp14] - artifacts: + needs: [build-debug-clang-cpp14] + artifacts: reports: junit: report.xml @@ -304,7 +311,9 @@ test-release-clang-cpp14: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-release-clang-cpp14] - artifacts: + needs: [build-release-clang-cpp14] + artifacts: + - * reports: junit: report.xml diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index fbcd709e..82578b93 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -10,7 +10,8 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] - artifacts: + needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] + artifacts: reports: junit: report.xml From cc2c81601cbcd04facc1fb62d7d07abf3691f70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 25 May 2020 11:56:41 +0200 Subject: [PATCH 05/12] Next try --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd5effa4..46bf23f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -313,7 +313,8 @@ test-release-clang-cpp14: dependencies: [build-release-clang-cpp14] needs: [build-release-clang-cpp14] artifacts: - - * + paths: + - * reports: junit: report.xml From b4c6920f6a23c6011204f63b181524d13fb8a7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 25 May 2020 11:58:09 +0200 Subject: [PATCH 06/12] Next try --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46bf23f0..f6dc203d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -314,7 +314,7 @@ test-release-clang-cpp14: needs: [build-release-clang-cpp14] artifacts: paths: - - * + - ./* reports: junit: report.xml From d6d413febd544b6fad03115245986b96c5959282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 25 May 2020 13:08:27 +0200 Subject: [PATCH 07/12] Try to show test results in gitlab --- CI/ci-linux-test.sh | 9 ++++++--- CI/gitlab-ci/linux-template-test-job.yml | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CI/ci-linux-test.sh b/CI/ci-linux-test.sh index a898cfed..a9cc5fa8 100755 --- a/CI/ci-linux-test.sh +++ b/CI/ci-linux-test.sh @@ -42,7 +42,7 @@ echo -e "${NC}" cd Unittests #execute tests -./unittests --gtest_color=yes --gtest_output="xml:report.xml" +./unittests --gtest_color=yes --gtest_output=xml:./report.xml echo -e "${OUTPUT}" echo "" @@ -51,7 +51,7 @@ echo "Running unittests $BUILD_TYPE version with custom vector type" echo "======================================================================" echo -e "${NC}" -./unittests_customvec --gtest_color=yes --gtest_output="xml:report-customvec.xml" +./unittests_customvec --gtest_color=yes --gtest_output=xml:./report-customvec.xml echo -e "${OUTPUT}" echo "" @@ -61,7 +61,10 @@ echo "======================================================================" echo -e "${NC}" #execute tests -./unittests_doublevec --gtest_color=yes --gtest_output="xml:report-doublevec.xml" +./unittests_doublevec --gtest_color=yes --gtest_output=xml:./report-doublevec.xml + +pwd +ls *.xml cd .. cd .. diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index 82578b93..c1c35cda 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: - report.xml - report-customvec.xml - report-doublevec.xml + */Unittests/report.xml + */Unittests/report-customvec.xml + */Unittests/report-doublevec.xml From 76b94bb8942ac93b967a7879679a47c36d6e7e39 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 26 May 2020 09:49:09 +0200 Subject: [PATCH 08/12] 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 From f97c11cdb2e65397a74bd0775d235c1ea547f0f8 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 26 May 2020 10:00:55 +0200 Subject: [PATCH 09/12] mac test --- .gitlab-ci.yml | 105 ++++++++++++++++++++++-------- CI/ci-mac-prepare.sh | 6 +- CI/gitlab-ci/mac-template-job.yml | 20 ++++++ CI/gitlab-ci/mac.yml | 35 ++-------- 4 files changed, 106 insertions(+), 60 deletions(-) create mode 100644 CI/gitlab-ci/mac-template-job.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e128439..bf6c9743 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -322,40 +322,91 @@ test-release-clang-cpp14: # ----------------- -# Apple tasks +# MAC tasks # ----------------- -macos-cpp11-debug: - stage: build - script: "CI/ci-mac-build.sh C++11 debug ; CI/ci-mac-test.sh C++11 debug" - tags: - - Apple +#----------- Job Informations: +# Type: Build+Test: debug +# OS: Mac +# Language: cpp11 -macos-cpp14-debug: - stage: build - script: "CI/ci-mac-build.sh C++14 debug ; CI/ci-mac-test.sh C++14 debug" - tags: - - Apple +macos-cpp11-debug: + stage: build + script: "CI/ci-mac-build.sh cpp11 debug ; CI/ci-mac-test.sh cpp11 debug" + tags: + - Apple + artifacts: + paths: + - build-debug-cpp11/*.dmg + - build-debug-cpp11/*.tar.gz + reports: + junit: + - build-debug-cpp11/Unittests/report.xml + - build-debug-cpp11/Unittests/report-customvec.xml + - build-debug-cpp11/Unittests/report-doublevec.xml + +#----------- Job Informations: +# Type: Build+Test: release +# OS: Mac +# Language: cpp11 macos-cpp11-release: - stage: build - script: "CI/ci-mac-build.sh C++11 release ; CI/ci-mac-test.sh C++11 release" - tags: - - Apple - artifacts: - paths: - - build-release-cpp11/*.dmg - - build-release-cpp11/*.tar.gz + stage: build + script: "CI/ci-mac-build.sh cpp11 release ; CI/ci-mac-test.sh cpp11 release" + tags: + - Apple + artifacts: + paths: + - build-release-cpp11/*.dmg + - build-release-cpp11/*.tar.gz + reports: + junit: + - build-release-cpp11/Unittests/report.xml + - build-release-cpp11/Unittests/report-customvec.xml + - build-release-cpp11/Unittests/report-doublevec.xml + + +#----------- Job Informations: +# Type: Build+Test: debug +# OS: Mac +# Language: cpp14 + +macos-cpp14-debug: + stage: build + script: "CI/ci-mac-build.sh cpp14 debug ; CI/ci-mac-test.sh cpp14 debug" + tags: + - Apple + artifacts: + paths: + - build-debug-cpp14/*.dmg + - build-debug-cpp14/*.tar.gz + reports: + junit: + - build-debug-cpp14/Unittests/report.xml + - build-debug-cpp14/Unittests/report-customvec.xml + - build-debug-cpp14/Unittests/report-doublevec.xml + +#----------- Job Informations: +# Type: Build+Test: release +# OS: Mac +# Language: cpp14 macos-cpp14-release: - stage: build - script: "CI/ci-mac-build.sh C++14 release ; CI/ci-mac-test.sh C++14 release" - tags: - - Apple - artifacts: - paths: - - build-release-cpp14/*.dmg - - build-release-cpp14/*.tar.gz + stage: build + script: "CI/ci-mac-build.sh cpp14 release ; CI/ci-mac-test.sh cpp14 release" + tags: + - Apple + artifacts: + paths: + - build-release-cpp14/*.dmg + - build-release-cpp14/*.tar.gz + reports: + junit: + - build-release-cpp14/Unittests/report.xml + - build-release-cpp14/Unittests/report-customvec.xml + - build-release-cpp14/Unittests/report-doublevec.xml + + # ----------------- # Windows tasks diff --git a/CI/ci-mac-prepare.sh b/CI/ci-mac-prepare.sh index 985171c6..39cf1f35 100755 --- a/CI/ci-mac-prepare.sh +++ b/CI/ci-mac-prepare.sh @@ -14,14 +14,14 @@ OPTIONS="" # set GTEST path OPTIONS="$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.7.0/" -if [ "$LANGUAGE" == "C++98" ]; then +if [ "$LANGUAGE" == "cpp98" ]; then echo "Building with C++98"; BUILDPATH="cpp98" -elif [ "$LANGUAGE" == "C++11" ]; then +elif [ "$LANGUAGE" == "cpp11" ]; then echo "Building with C++11"; OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' " BUILDPATH="cpp11" -elif [ "$LANGUAGE" == "C++14" ]; then +elif [ "$LANGUAGE" == "cpp14" ]; then echo "Building with C++14"; OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++14' " BUILDPATH="cpp14" diff --git a/CI/gitlab-ci/mac-template-job.yml b/CI/gitlab-ci/mac-template-job.yml new file mode 100644 index 00000000..6ae57a9e --- /dev/null +++ b/CI/gitlab-ci/mac-template-job.yml @@ -0,0 +1,20 @@ +#----------- Job Informations: +# Type: Build+Test: {{BUILDTYPE}} +# OS: Mac +# Language: {{LANGUAGE}} + +macos-{{LANGUAGE}}-{{BUILDTYPE}}: + stage: build + script: "CI/ci-mac-build.sh {{LANGUAGE}} {{BUILDTYPE}} ; CI/ci-mac-test.sh {{LANGUAGE}} {{BUILDTYPE}}" + tags: + - Apple + artifacts: + paths: + - build-{{BUILDTYPE}}-{{LANGUAGE}}/*.dmg + - build-{{BUILDTYPE}}-{{LANGUAGE}}/*.tar.gz + reports: + junit: + - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report.xml + - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-customvec.xml + - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-doublevec.xml + diff --git a/CI/gitlab-ci/mac.yml b/CI/gitlab-ci/mac.yml index b385eeeb..208cda0c 100644 --- a/CI/gitlab-ci/mac.yml +++ b/CI/gitlab-ci/mac.yml @@ -1,35 +1,10 @@ # ----------------- -# Apple tasks +# MAC tasks # ----------------- -macos-cpp11-debug: - stage: build - script: "CI/ci-mac-build.sh C++11 debug ; CI/ci-mac-test.sh C++11 debug" - tags: - - Apple +{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp11} +{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp11} -macos-cpp14-debug: - stage: build - script: "CI/ci-mac-build.sh C++14 debug ; CI/ci-mac-test.sh C++14 debug" - tags: - - Apple +{mac-template-job.yml, BUILDTYPE=debug, LANGUAGE=cpp14} +{mac-template-job.yml, BUILDTYPE=release, LANGUAGE=cpp14} -macos-cpp11-release: - stage: build - script: "CI/ci-mac-build.sh C++11 release ; CI/ci-mac-test.sh C++11 release" - tags: - - Apple - artifacts: - paths: - - build-release-cpp11/*.dmg - - build-release-cpp11/*.tar.gz - -macos-cpp14-release: - stage: build - script: "CI/ci-mac-build.sh C++14 release ; CI/ci-mac-test.sh C++14 release" - tags: - - Apple - artifacts: - paths: - - build-release-cpp14/*.dmg - - build-release-cpp14/*.tar.gz From fc37e1a5fb2ff03bfe15f2e451da236f9f9ed7bb Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 26 May 2020 10:17:02 +0200 Subject: [PATCH 10/12] mac jobs without unittests gitlab integration --- .gitlab-ci.yml | 40 +++++++++++++++---------------- CI/gitlab-ci/mac-template-job.yml | 10 ++++---- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf6c9743..4041b293 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -339,11 +339,11 @@ macos-cpp11-debug: paths: - build-debug-cpp11/*.dmg - build-debug-cpp11/*.tar.gz - reports: - junit: - - build-debug-cpp11/Unittests/report.xml - - build-debug-cpp11/Unittests/report-customvec.xml - - build-debug-cpp11/Unittests/report-doublevec.xml +# reports: +# junit: +# - build-debug-cpp11/Unittests/report.xml +# - build-debug-cpp11/Unittests/report-customvec.xml +# - build-debug-cpp11/Unittests/report-doublevec.xml #----------- Job Informations: # Type: Build+Test: release @@ -359,11 +359,11 @@ macos-cpp11-release: paths: - build-release-cpp11/*.dmg - build-release-cpp11/*.tar.gz - reports: - junit: - - build-release-cpp11/Unittests/report.xml - - build-release-cpp11/Unittests/report-customvec.xml - - build-release-cpp11/Unittests/report-doublevec.xml +# reports: +# junit: +# - build-release-cpp11/Unittests/report.xml +# - build-release-cpp11/Unittests/report-customvec.xml +# - build-release-cpp11/Unittests/report-doublevec.xml #----------- Job Informations: @@ -380,11 +380,11 @@ macos-cpp14-debug: paths: - build-debug-cpp14/*.dmg - build-debug-cpp14/*.tar.gz - reports: - junit: - - build-debug-cpp14/Unittests/report.xml - - build-debug-cpp14/Unittests/report-customvec.xml - - build-debug-cpp14/Unittests/report-doublevec.xml +# reports: +# junit: +# - build-debug-cpp14/Unittests/report.xml +# - build-debug-cpp14/Unittests/report-customvec.xml +# - build-debug-cpp14/Unittests/report-doublevec.xml #----------- Job Informations: # Type: Build+Test: release @@ -400,11 +400,11 @@ macos-cpp14-release: paths: - build-release-cpp14/*.dmg - build-release-cpp14/*.tar.gz - reports: - junit: - - build-release-cpp14/Unittests/report.xml - - build-release-cpp14/Unittests/report-customvec.xml - - build-release-cpp14/Unittests/report-doublevec.xml +# reports: +# junit: +# - build-release-cpp14/Unittests/report.xml +# - build-release-cpp14/Unittests/report-customvec.xml +# - build-release-cpp14/Unittests/report-doublevec.xml diff --git a/CI/gitlab-ci/mac-template-job.yml b/CI/gitlab-ci/mac-template-job.yml index 6ae57a9e..bbbcec2c 100644 --- a/CI/gitlab-ci/mac-template-job.yml +++ b/CI/gitlab-ci/mac-template-job.yml @@ -12,9 +12,9 @@ macos-{{LANGUAGE}}-{{BUILDTYPE}}: paths: - build-{{BUILDTYPE}}-{{LANGUAGE}}/*.dmg - build-{{BUILDTYPE}}-{{LANGUAGE}}/*.tar.gz - reports: - junit: - - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report.xml - - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-customvec.xml - - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-doublevec.xml +# reports: +# junit: +# - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report.xml +# - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-customvec.xml +# - build-{{BUILDTYPE}}-{{LANGUAGE}}/Unittests/report-doublevec.xml From 847e0bca8da12c0ac310dd693122748642a77601 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 26 May 2020 10:25:30 +0200 Subject: [PATCH 11/12] testing --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++ CI/gitlab-ci/linux-template-test-job.yml | 5 +++ 2 files changed, 45 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4041b293..bed1811e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,11 @@ test-debug-gcc-cpp11: tags: [Docker] dependencies: [build-debug-gcc-cpp11] needs: [build-debug-gcc-cpp11] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-gcc-cpp11-debug-Vector-Checks + - ls -lh build-gcc-cpp11-debug-Vector-Checks/Unittests artifacts: reports: junit: @@ -96,6 +101,11 @@ test-release-gcc-cpp11: tags: [Docker] dependencies: [build-release-gcc-cpp11] needs: [build-release-gcc-cpp11] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-gcc-cpp11-release-Vector-Checks + - ls -lh build-gcc-cpp11-release-Vector-Checks/Unittests artifacts: reports: junit: @@ -132,6 +142,11 @@ test-debug-clang-cpp11: tags: [Docker] dependencies: [build-debug-clang-cpp11] needs: [build-debug-clang-cpp11] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-clang-cpp11-debug-Vector-Checks + - ls -lh build-clang-cpp11-debug-Vector-Checks/Unittests artifacts: reports: junit: @@ -168,6 +183,11 @@ test-release-clang-cpp11: tags: [Docker] dependencies: [build-release-clang-cpp11] needs: [build-release-clang-cpp11] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-clang-cpp11-release-Vector-Checks + - ls -lh build-clang-cpp11-release-Vector-Checks/Unittests artifacts: reports: junit: @@ -204,6 +224,11 @@ test-debug-gcc-cpp14: tags: [Docker] dependencies: [build-debug-gcc-cpp14] needs: [build-debug-gcc-cpp14] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-gcc-cpp14-debug-Vector-Checks + - ls -lh build-gcc-cpp14-debug-Vector-Checks/Unittests artifacts: reports: junit: @@ -240,6 +265,11 @@ test-release-gcc-cpp14: tags: [Docker] dependencies: [build-release-gcc-cpp14] needs: [build-release-gcc-cpp14] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-gcc-cpp14-release-Vector-Checks + - ls -lh build-gcc-cpp14-release-Vector-Checks/Unittests artifacts: reports: junit: @@ -276,6 +306,11 @@ test-debug-clang-cpp14: tags: [Docker] dependencies: [build-debug-clang-cpp14] needs: [build-debug-clang-cpp14] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-clang-cpp14-debug-Vector-Checks + - ls -lh build-clang-cpp14-debug-Vector-Checks/Unittests artifacts: reports: junit: @@ -312,6 +347,11 @@ test-release-clang-cpp14: tags: [Docker] dependencies: [build-release-clang-cpp14] needs: [build-release-clang-cpp14] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-clang-cpp14-release-Vector-Checks + - ls -lh build-clang-cpp14-release-Vector-Checks/Unittests artifacts: reports: junit: diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index dba1864a..d889bc7d 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -11,6 +11,11 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: tags: [Docker] dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] + after_script: + - echo Debugging + - ls -l . + - ls -lh build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks + - ls -lh build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests artifacts: reports: junit: From af1cb02935c2d56e57d1289170188e4b628d5740 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 26 May 2020 10:38:10 +0200 Subject: [PATCH 12/12] fixed error --- .gitlab-ci.yml | 88 +++++++----------------- CI/gitlab-ci/linux-template-test-job.yml | 11 +-- 2 files changed, 27 insertions(+), 72 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bed1811e..489e55ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,17 +60,12 @@ test-debug-gcc-cpp11: tags: [Docker] dependencies: [build-debug-gcc-cpp11] needs: [build-debug-gcc-cpp11] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-gcc-cpp11-debug-Vector-Checks - - ls -lh build-gcc-cpp11-debug-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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: @@ -101,17 +96,12 @@ test-release-gcc-cpp11: tags: [Docker] dependencies: [build-release-gcc-cpp11] needs: [build-release-gcc-cpp11] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-gcc-cpp11-release-Vector-Checks - - ls -lh build-gcc-cpp11-release-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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: @@ -142,17 +132,12 @@ test-debug-clang-cpp11: tags: [Docker] dependencies: [build-debug-clang-cpp11] needs: [build-debug-clang-cpp11] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-clang-cpp11-debug-Vector-Checks - - ls -lh build-clang-cpp11-debug-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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: @@ -183,17 +168,12 @@ test-release-clang-cpp11: tags: [Docker] dependencies: [build-release-clang-cpp11] needs: [build-release-clang-cpp11] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-clang-cpp11-release-Vector-Checks - - ls -lh build-clang-cpp11-release-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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: @@ -224,17 +204,12 @@ test-debug-gcc-cpp14: tags: [Docker] dependencies: [build-debug-gcc-cpp14] needs: [build-debug-gcc-cpp14] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-gcc-cpp14-debug-Vector-Checks - - ls -lh build-gcc-cpp14-debug-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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: @@ -265,17 +240,12 @@ test-release-gcc-cpp14: tags: [Docker] dependencies: [build-release-gcc-cpp14] needs: [build-release-gcc-cpp14] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-gcc-cpp14-release-Vector-Checks - - ls -lh build-gcc-cpp14-release-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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: @@ -306,17 +276,12 @@ test-debug-clang-cpp14: tags: [Docker] dependencies: [build-debug-clang-cpp14] needs: [build-debug-clang-cpp14] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-clang-cpp14-debug-Vector-Checks - - ls -lh build-clang-cpp14-debug-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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: @@ -347,17 +312,12 @@ test-release-clang-cpp14: tags: [Docker] dependencies: [build-release-clang-cpp14] needs: [build-release-clang-cpp14] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-clang-cpp14-release-Vector-Checks - - ls -lh build-clang-cpp14-release-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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 d889bc7d..efc091ab 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -11,15 +11,10 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}: tags: [Docker] dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}] - after_script: - - echo Debugging - - ls -l . - - ls -lh build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks - - ls -lh build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-Vector-Checks/Unittests artifacts: reports: junit: - 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 + - 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