From 322f6a578600f05b62293b906a090990aa7fb707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Mon, 20 Jan 2025 15:40:11 +0100 Subject: [PATCH 01/19] Enable codec-smoke-test job --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5b078e8b..b929a9cdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1491,8 +1491,7 @@ voip-be-on-merge-request: # --------------------------------------------------------------- # test that runs all modes with 1s input signals -# TODO: disabled temporarily, needs to be adapted to BASOP -.codec-smoke-test: +codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request @@ -1785,11 +1784,10 @@ ivas-pytest-on-merge-request: - .test-job-linux-needs-testv-dir - .rules-merge-request stage: compare - # TODO: broken dependency needs to be removed temporarily, see above # note: this step doesn't really depend on codec-smoke-test # it's just pointless to run this step when the smoke test fails and the smoke test should be reasonably fast # thus, overall, this should save time - needs: ["build-codec-linux-make"] #, "codec-smoke-test"] + needs: ["build-codec-linux-make", "codec-smoke-test"] timeout: "14 minutes" tags: - ivas-linux -- GitLab From 62d674ead0d440c1e44e670501e66c4cd7a4aab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Mon, 20 Jan 2025 15:57:49 +0100 Subject: [PATCH 02/19] Trigger build -- GitLab From 99d189b29c49156fcaa966e7ab839660928a8fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Tue, 21 Jan 2025 17:15:01 +0100 Subject: [PATCH 03/19] Temporarily switch to other scripts branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b929a9cdf..20f414353 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: REF_DECODER_PATH: "./IVAS_dec_ref" LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' - BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" + BASOP_CI_BRANCH_PC_REPO: "mullerfa/python-improvements" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 -- GitLab From 370c0082c47a9c8f5836e0c1af4f3302ab92b76c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Wed, 22 Jan 2025 19:57:45 +0100 Subject: [PATCH 04/19] Store coding smoke test logs as artifacts --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20f414353..675f53acf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1520,6 +1520,7 @@ codec-smoke-test: - smoke_test_output.txt - smoke_test_output_jbm.txt - smoke_test_output_hrtf.txt + - out/logs/ expose_as: "Smoke test results" # from float repo -- GitLab From 61bd528ab417c76b2df2fece1450927cc70ba707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 23 Jan 2025 10:59:46 +0100 Subject: [PATCH 05/19] Trigger build -- GitLab From b85ed662a58eeebf75f784b7b4c0932ee91c1e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 23 Jan 2025 11:08:01 +0100 Subject: [PATCH 06/19] Fix escaping --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 675f53acf..cafd755d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -225,10 +225,10 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR - sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links - - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch + - git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" # Add currently used branch - git fetch - git restore . # Just as a precaution - - git checkout $BASOP_CI_BRANCH_PC_REPO + - git checkout "$BASOP_CI_BRANCH_PC_REPO" - git pull - cd - - cp -r $SCRIPTS_DIR/ci . -- GitLab From e684a88897bca2dfee6b605275a4c143e02807d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 23 Jan 2025 11:08:22 +0100 Subject: [PATCH 07/19] Fix checkout of divergent branches --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cafd755d4..9af81c554 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -229,6 +229,7 @@ stages: - git fetch - git restore . # Just as a precaution - git checkout "$BASOP_CI_BRANCH_PC_REPO" + - git reset --hard origin/"$BASOP_CI_BRANCH_PC_REPO" - git pull - cd - - cp -r $SCRIPTS_DIR/ci . -- GitLab From 53d9f93210f0a656a336c265ed840f2936f0695e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 23 Jan 2025 11:23:05 +0100 Subject: [PATCH 08/19] Try to compress logs beforehand --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9af81c554..bfd6cdf67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1506,6 +1506,9 @@ codec-smoke-test: # LTV update needed as ltv ISM metadata files are used - *update-ltv-repo - bash ci/smoke_test.sh + - tar cfvJ logs.tar.xz out/logs/ + - tar -I zstd -cfv logs.tar.zstd out/logs/ + - ls -al logs.tar.* ### analyze for failures - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_jbm.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi - ret_val=0 @@ -1521,7 +1524,8 @@ codec-smoke-test: - smoke_test_output.txt - smoke_test_output_jbm.txt - smoke_test_output_hrtf.txt - - out/logs/ + #- logs.tar.xz + - logs.tar.zstd expose_as: "Smoke test results" # from float repo -- GitLab From ec20b379e12624b354172040d6c46a2940e6bf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 23 Jan 2025 11:34:21 +0100 Subject: [PATCH 09/19] Be less verbose --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfd6cdf67..8f9e7a30f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1506,8 +1506,8 @@ codec-smoke-test: # LTV update needed as ltv ISM metadata files are used - *update-ltv-repo - bash ci/smoke_test.sh - - tar cfvJ logs.tar.xz out/logs/ - - tar -I zstd -cfv logs.tar.zstd out/logs/ + - tar cfJ logs.tar.xz out/logs/ + - tar -I zstd -cf logs.tar.zstd out/logs/ - ls -al logs.tar.* ### analyze for failures - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_jbm.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi -- GitLab From 9e50af4e5a22bad667fec6445572447fc769013b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 23 Jan 2025 11:48:23 +0100 Subject: [PATCH 10/19] zstd works --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f9e7a30f..8684f3030 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1506,7 +1506,6 @@ codec-smoke-test: # LTV update needed as ltv ISM metadata files are used - *update-ltv-repo - bash ci/smoke_test.sh - - tar cfJ logs.tar.xz out/logs/ - tar -I zstd -cf logs.tar.zstd out/logs/ - ls -al logs.tar.* ### analyze for failures @@ -1524,7 +1523,6 @@ codec-smoke-test: - smoke_test_output.txt - smoke_test_output_jbm.txt - smoke_test_output_hrtf.txt - #- logs.tar.xz - logs.tar.zstd expose_as: "Smoke test results" -- GitLab From 1a32f76db861680c728ec3e92d9d1c50ac9e186b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 23 Jan 2025 13:30:15 +0100 Subject: [PATCH 11/19] Prepare combined format inputs Ported from float CI. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8684f3030..c3e2e6c5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -436,6 +436,7 @@ stages: before_script: - *update-scripts-repo - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi + - python3 scripts/prepare_combined_format_inputs.py - cp -r scripts/testv/* $TESTV_DIR/ .sanitizer-selftest-on-mr: -- GitLab From 674db7c08bc81594a7cd092a5d29571fd35da362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Wed, 29 Jan 2025 12:20:45 +0100 Subject: [PATCH 12/19] Filter out broken basop smoke test items --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3e2e6c5a..84dfc6395 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1506,6 +1506,7 @@ codec-smoke-test: - *print-common-info # LTV update needed as ltv ISM metadata files are used - *update-ltv-repo + - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline - bash ci/smoke_test.sh - tar -I zstd -cf logs.tar.zstd out/logs/ - ls -al logs.tar.* -- GitLab From 288ec5a3ff3ae6bf2fc5d1ad41c3ec08a66f8503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 30 Jan 2025 16:12:13 +0100 Subject: [PATCH 13/19] Update branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84dfc6395..36387dab7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: REF_DECODER_PATH: "./IVAS_dec_ref" LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' - BASOP_CI_BRANCH_PC_REPO: "mullerfa/python-improvements" + BASOP_CI_BRANCH_PC_REPO: "mullerfa/basop-smoke-test-fixes" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 -- GitLab From 02223f8f78a44aa9896f631503bbc5cf4cfbb8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 30 Jan 2025 16:21:49 +0100 Subject: [PATCH 14/19] Update branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36387dab7..bfcc48eb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: REF_DECODER_PATH: "./IVAS_dec_ref" LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' - BASOP_CI_BRANCH_PC_REPO: "mullerfa/basop-smoke-test-fixes" + BASOP_CI_BRANCH_PC_REPO: "mullerfa/python-improvements-basop-fixes-temp-branch" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 -- GitLab From 42d275918e917884eeb095a8a221b70de8a6c037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 30 Jan 2025 17:34:37 +0100 Subject: [PATCH 15/19] Switch to more common xz compression --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfcc48eb3..84944cc30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1508,7 +1508,7 @@ codec-smoke-test: - *update-ltv-repo - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline - bash ci/smoke_test.sh - - tar -I zstd -cf logs.tar.zstd out/logs/ + - tar -cfJ logs.tar.xz out/logs/ - ls -al logs.tar.* ### analyze for failures - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_jbm.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi @@ -1525,7 +1525,7 @@ codec-smoke-test: - smoke_test_output.txt - smoke_test_output_jbm.txt - smoke_test_output_hrtf.txt - - logs.tar.zstd + - logs.tar.xz expose_as: "Smoke test results" # from float repo -- GitLab From ee983944e70f2d0519b239b0aa64fcf8e0523269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 30 Jan 2025 17:49:20 +0100 Subject: [PATCH 16/19] Switch to even more common gz compression --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84944cc30..6e0cd84f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1508,7 +1508,7 @@ codec-smoke-test: - *update-ltv-repo - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline - bash ci/smoke_test.sh - - tar -cfJ logs.tar.xz out/logs/ + - tar -cfz logs.tar.gz out/logs/ - ls -al logs.tar.* ### analyze for failures - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_jbm.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi @@ -1525,7 +1525,7 @@ codec-smoke-test: - smoke_test_output.txt - smoke_test_output_jbm.txt - smoke_test_output_hrtf.txt - - logs.tar.xz + - logs.tar.gz expose_as: "Smoke test results" # from float repo -- GitLab From b2cfd5c7b17a529949b5c427cda9559a77183468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Thu, 30 Jan 2025 18:03:36 +0100 Subject: [PATCH 17/19] Fix order of flags and switch back to xz --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e0cd84f0..070635e9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1508,7 +1508,7 @@ codec-smoke-test: - *update-ltv-repo - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline - bash ci/smoke_test.sh - - tar -cfz logs.tar.gz out/logs/ + - tar cJf logs.tar.xz out/logs/ - ls -al logs.tar.* ### analyze for failures - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_jbm.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi @@ -1525,7 +1525,7 @@ codec-smoke-test: - smoke_test_output.txt - smoke_test_output_jbm.txt - smoke_test_output_hrtf.txt - - logs.tar.gz + - logs.tar.xz expose_as: "Smoke test results" # from float repo -- GitLab From 4dfacd59a5b339ab503f2773163b4e9ca12e2ee8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 4 Feb 2025 16:08:45 +0100 Subject: [PATCH 18/19] dummy commit to trigger CI -- GitLab From 020fbe8625c91921301c4804e8062c1d05aaf8f4 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 4 Feb 2025 16:10:19 +0100 Subject: [PATCH 19/19] Revert "Temporarily switch to other scripts branch" This reverts commit 99d189b29c49156fcaa966e7ab839660928a8fe1. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 070635e9c..a7159db0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: REF_DECODER_PATH: "./IVAS_dec_ref" LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' - BASOP_CI_BRANCH_PC_REPO: "mullerfa/python-improvements-basop-fixes-temp-branch" + BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 -- GitLab