Commit 96ca056f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

gitlab inputs can't be included

parent 34d96099
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ loudness-measurement:
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'loudness-measurement-only'

  variables:
    FORMAT_LIST: $[[ inputs.loudness_formats ]]
    CONFIG_JSON: $[[ inputs.loudness_config_json ]]
    FORMAT_LIST: $LOUDNESS_FORMATS
    CONFIG_JSON: $LOUDNESS_CONFIG

  allow_failure:
    exit_codes:
@@ -22,12 +22,11 @@ loudness-measurement:
  script:
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
    - set -x
    - echo "Using formats:${FORMAT_LIST}"
    - echo "Using config: ${CONFIG_JSON}"
    - echo "Using formats ${FORMAT_LIST}"
    - echo "Using config  ${CONFIG_JSON}"
    - git clone --single-branch --branch main https://gitlab-ci-token:${CI_JOB_TOKEN}@forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git
    - make -j
    - >

    - |
      for fmt in ${FORMAT_LIST};
      do
        ./scripts/runIvasCodec.py -z console -U 1:2 -p ${CONFIG_JSON} -x ${fmt}_b | tee -a smoke_test_output.txt
@@ -64,7 +63,6 @@ loudness-analysis:
  before_script:
    - !reference [.test-job-linux-needs-testv-dir, before_script]
    - |

      if [ ! -f "loudness.csv" ]; then
        echo "No loudness.csv found in current pipeline, fetching from last successful measurement job..."
        
+43 −48
Original line number Diff line number Diff line
spec:
  inputs:
    loudness_config_json:
      default: "scripts/config/ci_loudness_linux.json"
      type: string
      description: "Config JSON file path"
      options:
        - "scripts/config/ci_linux.json"
        - "scripts/config/ci_linux_ltv.json"
        - "scripts/config/ci_loudness_linux.json"

    loudness_formats:
      default: >
        mono stereo
        MC_5_1 MC_5_1_2 MC_5_1_4 MC_7_1 MC_7_1_4
        ISM1 ISM2 ISM3 ISM4
        FOA HOA2 HOA3
        MASA_1TC MASA_2TC
        OMASA_ISM1_1TC OMASA_ISM2_1TC OMASA_ISM3_1TC OMASA_ISM4_1TC
        OMASA_ISM1_2TC OMASA_ISM2_2TC OMASA_ISM3_2TC OMASA_ISM4_2TC
        OSBA_ISM1_FOA OSBA_ISM2_FOA OSBA_ISM3_FOA OSBA_ISM4_FOA
        OSBA_ISM1_HOA2 OSBA_ISM2_HOA2 OSBA_ISM3_HOA2 OSBA_ISM4_HOA2
        OSBA_ISM1_HOA3 OSBA_ISM2_HOA3 OSBA_ISM3_HOA3 OSBA_ISM4_HOA3
      type: string
      description: "Space-separated list of formats to test"

---
include:
  - local: includes/pre.yml
  - local: includes/default-variables.yml
@@ -61,26 +34,48 @@ variables:
  OUT_FORMATS_ALL: "$OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT"
  MANUAL_PIPELINE_TYPE:
    description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec."
    value: 'default'
    value: "default"
    options:
      - 'default'
      - 'test-be-release'
      - 'test-long-self-test'
      - 'ivas-conformance'
      - 'ivas-conformance-linux'
      - 'check-clipping'
      - 'test-branch-vs-input-passthrough'
      - 'coverage'
      - 'complexity'
      - 'loudness'
      - 'loudness-measurement-only'
      - 'loudness-analysis-only'
      - "default"
      - "test-be-release"
      - "test-long-self-test"
      - "ivas-conformance"
      - "ivas-conformance-linux"
      - "check-clipping"
      - "test-branch-vs-input-passthrough"
      - "coverage"
      - "complexity"
      - "loudness"
      - "loudness-measurement-only"
      - "loudness-analysis-only"

  PYTEST_ARGS: ""
  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"
  LOUDNESS_CONFIG:
    description: "Config JSON file path (needs MANUAL_PIPELINE_TYPE loudness*)"
    value: "scripts/config/ci_loudness_linux.json"
    options:
      # currently dont work due to inconsistent metadata naming
      # - "scripts/config/ci_linux.json"
      # - "scripts/config/ci_linux_ltv.json"
      - "scripts/config/ci_loudness_linux.json"

  LOUDNESS_FORMATS:
    description: "Space-separated list of formats to test (needs MANUAL_PIPELINE_TYPE loudness*)"
    value: >
      mono stereo
      MC_5_1 MC_5_1_2 MC_5_1_4 MC_7_1 MC_7_1_4
      ISM1 ISM2 ISM3 ISM4
      FOA HOA2 HOA3
      MASA_1TC MASA_2TC
      OMASA_ISM1_1TC OMASA_ISM2_1TC OMASA_ISM3_1TC OMASA_ISM4_1TC
      OMASA_ISM1_2TC OMASA_ISM2_2TC OMASA_ISM3_2TC OMASA_ISM4_2TC
      OSBA_ISM1_FOA OSBA_ISM2_FOA OSBA_ISM3_FOA OSBA_ISM4_FOA
      OSBA_ISM1_HOA2 OSBA_ISM2_HOA2 OSBA_ISM3_HOA2 OSBA_ISM4_HOA2
      OSBA_ISM1_HOA3 OSBA_ISM2_HOA3 OSBA_ISM3_HOA3 OSBA_ISM4_HOA3

# This sets when pipelines are created. Jobs have more specific rules to restrict them.
workflow:
@@ -127,16 +122,16 @@ workflow:
        IVAS_PIPELINE_NAME: "Coverage measurement"
    - 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 == 'loudness'
      variables:
        IVAS_PIPELINE_NAME: 'Loudness measurement and analysis on $CI_COMMIT_BRANCH'
        IVAS_PIPELINE_NAME: "Loudness measurement and analysis on $CI_COMMIT_BRANCH"
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'loudness-measurement-only'
      variables:
        IVAS_PIPELINE_NAME: 'Loudness measurement on $CI_COMMIT_BRANCH'
        IVAS_PIPELINE_NAME: "Loudness measurement on $CI_COMMIT_BRANCH"
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'loudness-analysis-only'
      variables:
        IVAS_PIPELINE_NAME: 'Loudness analysis on $CI_COMMIT_BRANCH'
        IVAS_PIPELINE_NAME: "Loudness analysis on $CI_COMMIT_BRANCH"

# ---------------------------------------------------------------
# Rules templates
@@ -152,8 +147,8 @@ workflow:

# These can be used later on to do common tasks

.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec 
  ### build test binaries, initial clean for paranoia reasons
.merge-request-comparison-setup-codec:
  &merge-request-comparison-setup-codec ### build test binaries, initial clean for paranoia reasons
  - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-debugging-macro.sh
  - make clean
  - mkdir build