From 9dcf8c150d38a0cd1520932be74adbde74806e19 Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 13:15:31 +0000 Subject: [PATCH 01/12] Test lcov_cobertura --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd61ad2dc..658ba064fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,6 +81,7 @@ stages: .test-job-linux: tags: - ivas-linux + - test-ericsson-linux-runner .build-job-linux: stage: build @@ -650,12 +651,17 @@ coverage-test-on-main-scheduled: - ./scripts/ivas_pytests/self_test_b.py --create_only --numprocesses 1 --encref IVAS_cod --decref IVAS_dec --encdut IVAS_cod --decdut IVAS_dec - lcov -c -d obj -o coverage.info - genhtml coverage.info -o coverage + - lcov_cobertura.py coverage.info -b obj -o coverage.xml artifacts: name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA" when: always paths: - coverage.info - coverage + reports: + coverage_report: + coverage_format: cobertura + path: coverage.xml # --------------------------------------------------------------- # Other jobs -- GitLab From 5695f38cc8b0cb96b13e0b8492841eea580775fa Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 13:17:36 +0000 Subject: [PATCH 02/12] Fix indentation --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 658ba064fb..3068e0078e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -658,10 +658,10 @@ coverage-test-on-main-scheduled: paths: - coverage.info - coverage - reports: - coverage_report: - coverage_format: cobertura - path: coverage.xml + reports: + coverage_report: + coverage_format: cobertura + path: coverage.xml # --------------------------------------------------------------- # Other jobs -- GitLab From e1b6e23b5a4596c2cae19e4adf6f00cc5b07ed11 Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 13:20:06 +0000 Subject: [PATCH 03/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3068e0078e..a7940ad61c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -653,11 +653,6 @@ coverage-test-on-main-scheduled: - genhtml coverage.info -o coverage - lcov_cobertura.py coverage.info -b obj -o coverage.xml artifacts: - name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA" - when: always - paths: - - coverage.info - - coverage reports: coverage_report: coverage_format: cobertura -- GitLab From 89daa6965b592fc6c9a27475ac4921ceda515f53 Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 13:41:03 +0000 Subject: [PATCH 04/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7940ad61c..b96def85eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -658,6 +658,7 @@ coverage-test-on-main-scheduled: coverage_format: cobertura path: coverage.xml + # --------------------------------------------------------------- # Other jobs # --------------------------------------------------------------- -- GitLab From 749ce6cb58695ee2ed7cd315e509cb3ac99da0dd Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 13:47:52 +0000 Subject: [PATCH 05/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b96def85eb..8072ed0bd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -652,11 +652,11 @@ coverage-test-on-main-scheduled: - lcov -c -d obj -o coverage.info - genhtml coverage.info -o coverage - lcov_cobertura.py coverage.info -b obj -o coverage.xml - artifacts: - reports: - coverage_report: - coverage_format: cobertura - path: coverage.xml + artifacts: + reports: + coverage_report: + coverage_format: cobertura + path: coverage.xml # --------------------------------------------------------------- -- GitLab From dc8323869147a88d9d7d95265743efe517a6089b Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 15:42:25 +0000 Subject: [PATCH 06/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8072ed0bd0..d6f8a2ee82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -653,6 +653,7 @@ coverage-test-on-main-scheduled: - genhtml coverage.info -o coverage - lcov_cobertura.py coverage.info -b obj -o coverage.xml artifacts: + expire_in: 2 days reports: coverage_report: coverage_format: cobertura -- GitLab From e41004b4127b1cabde93aa5acae0f7a2fbcbbf9b Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 15:44:31 +0000 Subject: [PATCH 07/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6f8a2ee82..028c796ae9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -653,11 +653,13 @@ coverage-test-on-main-scheduled: - genhtml coverage.info -o coverage - lcov_cobertura.py coverage.info -b obj -o coverage.xml artifacts: - expire_in: 2 days - reports: - coverage_report: - coverage_format: cobertura - path: coverage.xml + name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA" + when: always + paths: + - coverage.info + - coverage + - coverage.xml + # --------------------------------------------------------------- -- GitLab From c86984d1878c5c76b1d708ce46b397d78ccf6832 Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 15:46:46 +0000 Subject: [PATCH 08/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 028c796ae9..e7a364c816 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -636,7 +636,7 @@ sanitizer-test-planarsba: coverage-test-on-main-scheduled: extends: - .test-job-linux-needs-testv-dir - - .rules-main-scheduled +# - .rules-main-scheduled tags: - coverage-test stage: test -- GitLab From 51ab375538dc4ef8c7227d47bd99a8c2657effc2 Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 15:48:31 +0000 Subject: [PATCH 09/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7a364c816..b1112f212d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Runs for merge requests - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main + - if: $CI_PIPELINE_SOURCE == 'schedule' && $COVERAGE_TEST == 1 stages: - maintenance -- GitLab From fa36371367a09d571e0717cb2c029cdc506fe786 Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 15:49:20 +0000 Subject: [PATCH 10/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1112f212d..0f366811be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Runs for merge requests - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main - - if: $CI_PIPELINE_SOURCE == 'schedule' && $COVERAGE_TEST == 1 + - if: $CI_PIPELINE_SOURCE == 'schedule' && $COVERAGE_TEST == '1' stages: - maintenance -- GitLab From 3f6d0a61889b6bc4b0df54d87cdddf107fedf0f7 Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 15:51:53 +0000 Subject: [PATCH 11/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f366811be..0eb74850a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,6 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Runs for merge requests - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main - - if: $CI_PIPELINE_SOURCE == 'schedule' && $COVERAGE_TEST == '1' stages: - maintenance @@ -637,7 +636,7 @@ sanitizer-test-planarsba: coverage-test-on-main-scheduled: extends: - .test-job-linux-needs-testv-dir -# - .rules-main-scheduled + - .rules-merge-request tags: - coverage-test stage: test -- GitLab From 3e740a7773666d82a3f6a3abe556abc4cdca0f0c Mon Sep 17 00:00:00 2001 From: norvell Date: Mon, 26 Sep 2022 15:54:15 +0000 Subject: [PATCH 12/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0eb74850a7..7f9049507e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ variables: OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4" OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3" OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM" + COVERAGE_TEST: "1" # This sets when pipelines are created. Jobs have more specific rules to restrict them. -- GitLab