Commit 40f88a08 authored by Jan Kiene's avatar Jan Kiene
Browse files

convert merge-request-comparison-setup-codec into script

parent 2699aba9

main-basop.yml

+4 −17
Original line number Diff line number Diff line
@@ -86,19 +86,6 @@ workflow: 
  - Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" | ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path $_.FullName }



# From float CI

.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec

  - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh



  # need to rename to match the conventions for the renderer tests...

  - mv $MERGE_TARGET_ENCODER_PATH $REF_ENCODER_PATH

  - mv $MERGE_TARGET_DECODER_PATH $REF_DECODER_PATH

  - mv $MERGE_TARGET_RENDERER_PATH $REF_RENDERER_PATH

  # NOTE: temporary solution for merge to main

  - if [ -f $MERGE_TARGET_POST_RENDERER_PATH ]; then mv $MERGE_TARGET_POST_RENDERER_PATH $REF_POST_RENDERER_PATH; fi



  - make clean

  - make -j



.merge-request-comparison-check: &merge-request-comparison-check

  - echo "--------------- Running merge-request-comparison-check anchor ---------------"

  - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi
@@ -1236,7 +1223,7 @@ renderer-pytest-on-merge-request: 
  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

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

    - *merge-request-comparison-setup-codec

    - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo
@@ -1299,7 +1286,7 @@ ivas-pytest-on-merge-request: 
  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

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

    - *merge-request-comparison-setup-codec

    - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set



    # some helper variables - "|| true" to prevent failures from grep not finding anything
@@ -1364,7 +1351,7 @@ ivas-pytest-on-merge-request: 
  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

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

    - *merge-request-comparison-setup-codec

    - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo
@@ -1513,7 +1500,7 @@ ivas-interop-on-merge-request: 
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/float/check-commits-behind-count-in-compare-jobs.sh

    - *merge-request-comparison-setup-codec

    - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set

snippets/merge-request-comparison-setup-codec.sh

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#! /bin/bash



# need to rename to match the conventions for the renderer tests...

mv $MERGE_TARGET_ENCODER_PATH $REF_ENCODER_PATH

mv $MERGE_TARGET_DECODER_PATH $REF_DECODER_PATH

mv $MERGE_TARGET_RENDERER_PATH $REF_RENDERER_PATH

# NOTE: temporary solution for merge to main

if [ -f $MERGE_TARGET_POST_RENDERER_PATH ]; then mv $MERGE_TARGET_POST_RENDERER_PATH $REF_POST_RENDERER_PATH; fi



make clean

make -j