Commit cc679571 authored by Jan Kiene's avatar Jan Kiene
Browse files

align with current ivas-codec main

parent e5c84eeb

includes/default-variables-float.yml

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ variables: 
      - 'ivas-conformance-linux'

      - 'check-clipping'

      - 'test-branch-vs-input-passthrough'

      - 'coverage'



  PYTEST_ARGS: ""

  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
@@ -26,3 +27,7 @@ variables: 
  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"

  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"

  TEST_SUITE: ""

  COVERAGE_OUTPUT_FILE_STV: "coverage-stv.info"

  COVERAGE_OUTPUT_FILE_LTV: "coverage-ltv.info"

  COVERAGE_OUTPUT_FILE_CONFORMANCE: "coverage-conformance.info"

  COVERAGE_OUTPUT_FILE_MERGED: "coverage-merged.info"

includes/rules.yml

+0 −14
Original line number Diff line number Diff line
@@ -28,20 +28,6 @@ 
    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



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

  extends: .rules-basis

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "basop-ci-branch"

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



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

  extends: .rules-basis

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "basop-ci-branch" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main")

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never



.rules-main-push:

  extends: .rules-basis

  rules: