Commit 663ff679 authored by Jan Kiene's avatar Jan Kiene
Browse files

re-organize, no ltv run with BASOP main builds, adjust timeouts

parent 32044b83

.gitlab-ci.yml

+29 −25
Original line number Original line Diff line number Diff line
@@ -233,12 +233,6 @@ branch-is-up-to-date-with-main-post: 
    - .rules-merge-request-to-basop-ci-branch

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

  tags:

  tags:

    - ivas-linux

    - ivas-linux

  parallel:

    matrix:

      # note: keep in sync with list in $TESTS_DIR_CODEC_BE_ON_MR

      - BASOP_BRANCH:

          - main

          - ivas-float-update

  before_script:

  before_script:

    - !reference [.job-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
@@ -250,10 +244,13 @@ branch-is-up-to-date-with-main-post: 




    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/float/build-binaries-from-basop-repo.sh $BASOP_BRANCH

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/float/build-binaries-from-basop-repo.sh $BASOP_BRANCH





    - testcase_timeout=$TESTCASE_TIMEOUT

    - if [ "$BASOP_BRANCH" == "main" ]; then testcase_timeout=TESTCASE_TIMEOUT_LTV_SANITIZERS; fi



    # hack for renderer tests to match the expected naming

    # hack for renderer tests to match the expected naming

    - mv IVAS_rend IVAS_rend_ref

    - mv IVAS_rend IVAS_rend_ref





    - python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$TESTCASE_TIMEOUT

    - python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout





  artifacts:

  artifacts:

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
@@ -268,32 +265,48 @@ branch-is-up-to-date-with-main-post: 
      junit:

      junit:

        - report-junit.xml

        - report-junit.xml





### The stv jobs are run for both main and ivas-float-update

basop-ref-compat-stv:

basop-ref-compat-stv:

  extends:

  extends:

    - .basop-ci-branch-compat-template

    - .basop-ci-branch-compat-template

  variables:

  variables:

    TEST_SUITE: "$SHORT_TEST_SUITE tests/renderer"

    TEST_SUITE: "$SHORT_TEST_SUITE tests/renderer"

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS

  parallel:

    matrix:

      - BASOP_BRANCH:

          - main

          - ivas-float-update

  script:

  script:

    - exit 0

    - exit 0





basop-ref-compat-ltv:

basop-ref-compat-encoder-dmx-comp:

  extends:

  extends:

    - .basop-ci-branch-compat-template

    - .basop-ci-branch-compat-template

  tags:

    - ivas-linux-fast

  variables:

  variables:

    TEST_SUITE: $LONG_TEST_SUITE

    TEST_SUITE: $SHORT_TEST_SUITE_ENCODER

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS

    # USING PYTEST_ADDOPTS env var did not work for some reason when testing locally - maybe because this is a custom option

    PYTEST_ARGS: "--compare_enc_dmx"

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS

  parallel:

    matrix:

      - BASOP_BRANCH:

          - main

          - ivas-float-update

  script:

  script:

    - exit 0

    - exit 0





basop-ref-compat-encoder-stv:

### The ltv jobs are run for ivas-float-update only to save time



basop-ref-compat-ltv:

  extends:

  extends:

    - .basop-ci-branch-compat-template

    - .basop-ci-branch-compat-template

  tags:

    - ivas-linux-fast

  variables:

  variables:

    TEST_SUITE: $SHORT_TEST_SUITE_ENCODER

    TEST_SUITE: $LONG_TEST_SUITE

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS

    BASOP_BRANCH: "ivas-float-update"

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS

  script:

  script:

    - exit 0

    - exit 0
@@ -304,20 +317,11 @@ basop-ref-compat-encoder-ltv: 
    - ivas-linux-fast

    - ivas-linux-fast

  variables:

  variables:

    TEST_SUITE: $LONG_TEST_SUITE_ENCODER

    TEST_SUITE: $LONG_TEST_SUITE_ENCODER

    BASOP_BRANCH: "ivas-float-update"

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS

  script:

  script:

    - exit 0

    - exit 0





basop-ref-compat-encoder-dmx-comp:

  extends:

    - .basop-ci-branch-compat-template

  variables:

    TEST_SUITE: $SHORT_TEST_SUITE_ENCODER

    # USING PYTEST_ADDOPTS env var did not work for some reason when testing locally - maybe because this is a custom option

    PYTEST_ARGS: "--compare_enc_dmx"

    TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS

  script:

    - exit 0





# ---------------------------------------------------------------

# ---------------------------------------------------------------

# Build jobs

# Build jobs