Commit e3fa4e94 authored by norvell's avatar norvell
Browse files

Merge branch 'setup-basop-ci-branch-pc' into 'basop-ci-branch-pc' 

Set reference branch to float-pc for testing. Use HRTF model files from...

See merge request !2154
parents 46f648ec d189eaed

.gitlab-ci.yml

+7 −7
Original line number Diff line number Diff line 
variables:

  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this

  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 44cb5638949b874ce0f5c3bf4359f9db860d88bc

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 1ed1eb9dba06245fbcc80bcd24ea43be284f7f8e



include:

  - local: .gitlab-ci/variables.yml
@@ -63,7 +63,7 @@ workflow: 
    ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression



.get-basop-float-reference: &get-basop-float-reference

  - git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch --depth 1 ivas-basop

  - git clone -b $BASOP_REFERENCE_BRANCH_PC https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch --depth 1 ivas-basop

  - cd ivas-basop

  - git status

  - make -j
@@ -238,12 +238,12 @@ branch-is-up-to-date-with-main-post: 
.basop-ci-branch-compat-template:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-basop-ci-branch

    - .rules-merge-request-to-basop-ci-branch-pc

  tags:

    - ivas-linux

  before_script:

    - !reference [.job-linux, before_script]

    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm

    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm --use-main-pc-set

    - python3 tests/create_short_testvectors.py

    - python3 scripts/prepare_combined_format_inputs.py
@@ -401,7 +401,7 @@ build-codec-windows-msbuild: 
codec-smoke-test:

  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request-to-basop-ci-branch-or-main

    - .rules-merge-request-to-basop-ci-branch-pc-or-main

  timeout: "20 minutes"

  tags:

    - ivas-linux-fast
@@ -412,9 +412,9 @@ codec-smoke-test: 
    # LTV update needed as ltv ISM metadata files are used

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh



    # for MRs to basop-ci-branch, we want to test with the BASOP float reference build

    # for MRs to basop-ci-branch-pc, we want to test with the BASOP float reference build

    # per default, the smoke test builds the current repo again with WMOPS activated to catch unbalanced instrumentation macros

    - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch" ]; then

    - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch-pc" ]; then

    -   python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline

    -   *get-basop-float-reference

    -   bash ci/smoke_test.sh coverage