Commit 8b86fdae authored by Fabian Müller's avatar Fabian Müller
Browse files

Post-rebase fixes

parent f4344fb8

.gitlab-ci.yml

+3 −4
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ workflow: 
    - .job-linux

  script:

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

  - !reference [.job-linux, before_script]



.print-results-banner: &print-results-banner

  -   set +x
@@ -175,7 +174,7 @@ workflow: 
.test-job-linux-needs-testv-dir:

  extends: .test-job-linux

  before_script:

    - *update-scripts-repo

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

    - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi

    - cp -r scripts/testv/* $TESTV_DIR/
@@ -223,7 +222,7 @@ workflow: 
    - if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; MEASURES_FOR_REPORT="$MEASURES_FOR_REPORT DELTA_ODG"; fi

    - if [ "$SPLIT_COMPARISON" = "true" ]; then comp_args="${comp_args} --split-comparison"; fi



    - *build-and-create-float-ref-outputs

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-and-create-float-ref-outputs.sh



    # DMX comparison only in manual job with no other metrics

    - if [ "$COMPARE_DMX" = "true" ]; then
@@ -462,7 +461,7 @@ workflow: 
    -   exit 0

    - fi



    - *update-scripts-repo

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



    - if [ $USE_LTV -eq 1 ]; then

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