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

fix PYTEST_ADDOPTS string

parent 47bf67bd

.gitlab-ci.yml

+197 −202
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ variables: 
  MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_merge_target"

  MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target"

  LEVEL_SCALING: "1.0"

  IVAS_PIPELINE_NAME: ''

  IVAS_PIPELINE_NAME: ""

  BASOP_CI_BRANCH_PC_REPO: "kiene/tmp-branch-for-ltv-split-testing"

  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"

  TESTCASE_TIMEOUT_STV: 900
@@ -54,79 +54,77 @@ variables: 
  MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha"

  MANUAL_PIPELINE_TYPE:

    description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."

    value: 'default'

    value: "default"

    options:

      - 'default'

      - 'pytest-compare'

      - 'pytest-compare-enc-dmx'

      - 'pytest-compare-long'

      - 'pytest-compare-to-input'

      - 'pytest-saturation-smoke-test'

      - 'evs-26444'

      - 'sanitizer'

      - 'pytest-renderer'

      - 'complexity'

      - 'coverage'

      - 'voip-be-test'

      - 'peaq-enc-passthrough'



      - "default"

      - "pytest-compare"

      - "pytest-compare-enc-dmx"

      - "pytest-compare-long"

      - "pytest-compare-to-input"

      - "pytest-saturation-smoke-test"

      - "evs-26444"

      - "sanitizer"

      - "pytest-renderer"

      - "complexity"

      - "coverage"

      - "voip-be-test"

      - "peaq-enc-passthrough"



default:

  interruptible: true # Make all jobs by default interruptible



workflow:

  name: '$IVAS_PIPELINE_NAME'

  name: "$IVAS_PIPELINE_NAME"

  rules:

    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines

    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

      variables:

        IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'

        IVAS_PIPELINE_NAME: "MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"

    ### disabled for now because pipeline cd is redundant with MR pipeline with current workflow

    # - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

    #   variables:

    #     IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'default' # for testing

      variables:

        IVAS_PIPELINE_NAME: 'Web run pipeline: $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Web run pipeline: $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare'

      variables:

        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref: $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Run comparison tools against float ref: $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx'

      variables:

        IVAS_PIPELINE_NAME: 'Run encoder dmx comparison against float ref: $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Run encoder dmx comparison against float ref: $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-long'

      variables:

        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref (long test vectors): $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Run comparison tools against float ref (long test vectors): $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-to-input'

      variables:

        IVAS_PIPELINE_NAME: 'Run comparison tools against input (pass-through only): $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Run comparison tools against input (pass-through only): $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-saturation-smoke-test'

      variables:

        IVAS_PIPELINE_NAME: 'Run saturation smoke-test: $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Run saturation smoke-test: $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'

      variables:

        IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "EVS 26.444 test: $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer'

      variables:

        IVAS_PIPELINE_NAME: 'Short testvectors sanitizers'

        IVAS_PIPELINE_NAME: "Short testvectors sanitizers"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer'

      variables:

        IVAS_PIPELINE_NAME: 'Renderer test: $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Renderer test: $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'complexity'

      variables:

        IVAS_PIPELINE_NAME: 'Complexity Measurement on $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Complexity Measurement on $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'voip-be-test'

      variables:

        IVAS_PIPELINE_NAME: 'Voip BE test on $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "Voip BE test on $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough'

      variables:

        IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'

        IVAS_PIPELINE_NAME: "PEAQ encoder pass-through test: $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch

      variables:

        IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'        



        IVAS_PIPELINE_NAME: "Scheduled pipeline: $CI_COMMIT_BRANCH"



stages:

  - .pre
@@ -197,8 +195,8 @@ stages: 
  - git rev-parse HEAD > $MERGE_TARGET_COMMIT_FILE

  - git checkout $current_commit_sha



.build-float-ref-and-dut-binaries: &build-float-ref-and-dut-binaries

### build reference binaries

.build-float-ref-and-dut-binaries:

  &build-float-ref-and-dut-binaries ### build reference binaries

  - *build-float-ref-binaries

  ### build dut binaries

  - *activate-debug-mode-info-if-set
@@ -404,7 +402,7 @@ stages: 
    - REPORT_ARG=""

    - if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi

    - if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; summary_args="${summary_args} DELTA_ODG"; REPORT_ARG="--delta_odg"; fi

    - if [ "$SPLIT_COMPARISON" = "true" ]; then comp_args="${comp_args} --split-comparison"; export PYTEST_ADDOPTS="-k \"not JBM\ and stereo and at""; fi

    - if [ "$SPLIT_COMPARISON" = "true" ]; then comp_args="${comp_args} --split-comparison"; export PYTEST_ADDOPTS="-k \"not JBM and stereo and at\""; fi



    - *build-and-create-float-ref-outputs
@@ -756,7 +754,6 @@ stages: 
        - $XML_REPORT_BRANCH

        - $XML_REPORT_MAIN





.ivas-pytest-sanitizers-anchor: &ivas-pytest-sanitizers-anchor

  stage: test

  needs: ["build-codec-linux-make"]
@@ -1548,7 +1545,6 @@ ivas-smoke-test-saturation: 
      - smoke_test_output_hrtf.txt

    expose_as: "saturation smoke test results"





# GCOV/LCOV coverage analysis of self_test suite

coverage-test-on-main-scheduled:

  extends:
@@ -1688,13 +1684,12 @@ voip-be-on-merge-request: 
    - make -j

    - python3 -m pytest tests/test_be_for_jbm_neutral_dly_profile.py





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

# Complexity measurement jobs

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



.complexity-measurements-setup:

  &complexity-measurements-setup # create necessary environment

.complexity-measurements-setup: &complexity-measurements-setup

  # create necessary environment

  ### 1. part: mainly same as in float repo - this is boilerplate code to make the gitlab pages presentation work

  - mkdir -p wmops/logs