From 88c81036b0bb953f857f239f7d5d299e6c037224 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 12 Oct 2022 11:33:23 +0200 Subject: [PATCH 1/5] also archive no-frameloss logs from sanitizer run --- .gitlab-ci.yml | 18 +++++++++--------- ci/run_scheduled_sanitizer_test.py | 14 +++++++++++--- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a866a166e3..0db1a21395 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -481,21 +481,21 @@ codec-comparison-on-main-push: when: always paths: - ep_015.g192 - - "CLANG*/logs" + - "CLANG*/logs*" -sanitizer-test-mono: - extends: .sanitizer-test-template - rules: - - if: $IS_SANITIZER_TEST_RUN - script: - - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS +#sanitizer-test-mono: + #extends: .sanitizer-test-template + #rules: + #- if: $IS_SANITIZER_TEST_RUN + #script: + #- python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS sanitizer-test-stereo: extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN - when: delayed - start_in: 20 minutes + #when: delayed + #start_in: 20 minutes script: - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index 1ffaaf55a8..bcfcc6891f 100644 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -93,12 +93,20 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) subprocess.call(GENPATT_CMD.split()) # cleanup to avoid script errors - # we want "logs" and "dec" subfolders to be empty -> delete and recreate them - cleanup_folders = ["logs", "dec"] + # we want "logs" and "dec" subfolders to be empty -> delete "dec" and rename "log" + # to keep the log files from the first run with no frame losses + folders_to_delete = ["dec"] + folders_to_backup = ["logs"] for t in tests: - for fol in cleanup_folders: + for fol in folders_to_delete: for fi in pathlib.Path(t).joinpath(fol).iterdir(): fi.unlink() + for fol in folders_to_backup: + path = pathlib.Path(t).joinpath(fol) + new_name = path.Path(str(path) + "_noPLC") + path.rename(new_name) + # need empty log folder to avoid crashes + path.mkdir() cmd_fec = cmd_no_fec + ["--decoder_only", "-f", EP_FILE] print("======== Script command line WITH plc: ========\n{}".format(" ".join(cmd_no_fec))) -- GitLab From 634ea76d39aafd88f7fd8e06b24fe85cee94a302 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 12 Oct 2022 11:35:34 +0200 Subject: [PATCH 2/5] change workflow temporarily for testing --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0db1a21395..05921565ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,8 @@ workflow: when: never - 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' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main + - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in main stages: - maintenance -- GitLab From fcecb75ec1dfa667e356ea13d6a0d7d7494c89db Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 12 Oct 2022 11:37:01 +0200 Subject: [PATCH 3/5] correct previous commit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05921565ec..173e7f64f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,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' # Scheduled in main + - if: $CI_PIPELINE_SOURCE == 'web' stages: - maintenance -- GitLab From 468e1c4afed1eb5b2209df6f24c4370f17a9b6de Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 12 Oct 2022 11:49:51 +0200 Subject: [PATCH 4/5] fix typo in script --- ci/run_scheduled_sanitizer_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index bcfcc6891f..4f3cd25c0b 100644 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -103,7 +103,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) fi.unlink() for fol in folders_to_backup: path = pathlib.Path(t).joinpath(fol) - new_name = path.Path(str(path) + "_noPLC") + new_name = pathlib.Path(str(path) + "_noPLC") path.rename(new_name) # need empty log folder to avoid crashes path.mkdir() -- GitLab From 65f97302f15905b2bae1eaf0daa3c401b7e4425c Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 12 Oct 2022 14:01:01 +0200 Subject: [PATCH 5/5] remove temporary changes for testing --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 173e7f64f3..9529be0e3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,7 @@ workflow: when: never - 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 == 'web' + - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main stages: - maintenance @@ -482,21 +481,22 @@ codec-comparison-on-main-push: when: always paths: - ep_015.g192 + # second wildcard is necessary to get encoder and no-PLC run logs - "CLANG*/logs*" -#sanitizer-test-mono: - #extends: .sanitizer-test-template - #rules: - #- if: $IS_SANITIZER_TEST_RUN - #script: - #- python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS +sanitizer-test-mono: + extends: .sanitizer-test-template + rules: + - if: $IS_SANITIZER_TEST_RUN + script: + - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS sanitizer-test-stereo: extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN - #when: delayed - #start_in: 20 minutes + when: delayed + start_in: 20 minutes script: - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS -- GitLab