From 36f9e61bf248324f16a7bbd1d1b06c5d94ab1bd2 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Fri, 25 Aug 2023 14:36:08 +0300 Subject: [PATCH 1/5] Add bits to enable manual runs of testing BE against the released codec. --- .gitlab-ci.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 079d8235e7..4445757e04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,13 @@ variables: EXIT_CODE_FAIL: 1 PROCESSING_SCRIPTS_BIN_DIR: "/test-bin" TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection" + MANUAL_PIPELINE_TYPE: + description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec." + value: 'default' + options: + - 'default' + - 'test-be-release' + default: interruptible: true # Make all jobs by default interruptible @@ -1037,6 +1044,24 @@ codec-comparison-on-main-push: reports: junit: report-junit.xml + +# --------------------------------------------------------------- +# Manual jobs +# --------------------------------------------------------------- + +test-be-to-release: + stage: test + tags: + - ivas-windows + resource_group: ivas-be-to-release-test-resource + timeout: "20 minutes" + rules: + - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-be-release' + script: + - echo "Placeholder for BE test to release" + - echo "$CI_COMMIT_BRANCH" + + # --------------------------------------------------------------- # Scheduled jobs on main # --------------------------------------------------------------- -- GitLab From 0faea7e3b7e181355fa9d79303a594e1f6e8e2e0 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Fri, 25 Aug 2023 14:46:23 +0300 Subject: [PATCH 2/5] Disable other jobs for manual run of test-be-release. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4445757e04..6a01a7a071 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,6 +150,8 @@ stages: when: never - if: $CI_PIPELINE_SOURCE == 'trigger' # Don't run triggered pipeline by default when: never + - if: $MANUAL_PIPELINE_TYPE == 'test-be-release' # Skip all the normal jobs when testing manually against release codec + when: never - when: on_success .rules-merge-request: -- GitLab From 15623b1535d386d884647ddb20768db7dcb73297 Mon Sep 17 00:00:00 2001 From: kinuthia Date: Mon, 28 Aug 2023 08:19:23 +0000 Subject: [PATCH 3/5] ci-job-for-running-BE-test --- .gitlab-ci.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a01a7a071..03aa6c6eb9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,8 @@ variables: BUILD_OUTPUT: "build_output.txt" EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test" EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec" + RELEASE_CANDIDATE_DIR: "C:/Users/gitlab-runner/release_candidate" + RELEASE_CANDIDATE_TESTV: "" # should be overwriten in config.toml file SANITIZER_TESTS: "CLANG1 CLANG2" 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" @@ -1060,9 +1062,24 @@ test-be-to-release: rules: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-be-release' script: - - echo "Placeholder for BE test to release" + - mkdir release_candidate + - cp $RELEASE_CANDIDATE_DIR/* release_candidate/ + - echo "$CI_COMMIT_BRANCH" + - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug -m | tee -variable winoutdata + - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 + - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression + - ("exit $LASTEXITCODE") | Invoke-Expression + - echo "Placeholder for BE test to release script" + - mkdir logs + + artifacts: + name: "test-be-to-release--sha-$CI_COMMIT_SHORT_SHA--results" + expire_in: 1 week + paths: + - logs/ + expose_as: "test-be-to-release results" # --------------------------------------------------------------- # Scheduled jobs on main -- GitLab From 127f5a880df8fa5f897b9fba66f326b0af6432f0 Mon Sep 17 00:00:00 2001 From: kinuthia Date: Mon, 28 Aug 2023 09:42:03 +0000 Subject: [PATCH 4/5] build for 32-bit - use definitions in cofig.toml - remove RELEASE_CANDIDATE_TESTV from yml script --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03aa6c6eb9..17b8d447b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,6 @@ variables: BUILD_OUTPUT: "build_output.txt" EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test" EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec" - RELEASE_CANDIDATE_DIR: "C:/Users/gitlab-runner/release_candidate" - RELEASE_CANDIDATE_TESTV: "" # should be overwriten in config.toml file SANITIZER_TESTS: "CLANG1 CLANG2" 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" @@ -1062,15 +1060,15 @@ test-be-to-release: rules: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-be-release' script: - - mkdir release_candidate - - cp $RELEASE_CANDIDATE_DIR/* release_candidate/ - echo "$CI_COMMIT_BRANCH" - - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug -m | tee -variable winoutdata + - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug /p:Platform=win32 /m | tee -variable winoutdata - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression - ("exit $LASTEXITCODE") | Invoke-Expression + # path to release candidate refs defined in config.toml + - echo "Placeholder for BE test to release script" - mkdir logs -- GitLab From 379f8d493761e63222db0cc39cfc62ac1c546e10 Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Wed, 30 Aug 2023 11:47:26 +0200 Subject: [PATCH 5/5] always upload artifacts --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17b8d447b9..5daef0cdf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1074,6 +1074,7 @@ test-be-to-release: artifacts: name: "test-be-to-release--sha-$CI_COMMIT_SHORT_SHA--results" + when: always expire_in: 1 week paths: - logs/ -- GitLab