Commit 53228a4a authored by Jan Kiene's avatar Jan Kiene
Browse files

check for up-to-date with main in regression jobs, too 

also rename anchor as it is only used for the regressions checks now
parent e28286c8

.gitlab-ci.yml

+21 −16
Original line number Diff line number Diff line
@@ -436,6 +436,14 @@ stages: 
      junit:

        - report-junit.xml



.check-up-to-date-in-comparison-jobs: &check-up-to-date-in-comparison-jobs

    - *get-commits-behind-count

    - |

      if [ $commits_behind_count -ne 0 ]; then

        echo -e "Your branch is $commits_behind_count commits behind the target branch, possibly main changed during your pipeline run. Checking bitexactness or testing for regressions now can result in meaningless results. Run\n\t git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."

        exit 1

      fi



.check-be-to-target-anchor: &check-be-to-target-anchor

  stage: check-be

  needs: ["build-codec-linux-make"]
@@ -445,16 +453,11 @@ stages: 
    XML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"

    HTML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.html"

  script:

    - set -euxo pipefail

    - *check-up-to-date-in-comparison-jobs

    - *print-common-info



    - *get-commits-behind-count

    - |

      if [ $commits_behind_count -ne 0 ]; then

        echo -e "Your branch is $commits_behind_count commits behind the target branch, possibly main changed during your pipeline run. Checking bitexactness now can result in meaningless results. Run\n\t git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."

        exit 1

      fi

    - set -euxo pipefail



    - *print-common-info

    - *update-scripts-repo



    - if [ $USE_LTV -eq 1 ]; then
@@ -541,7 +544,7 @@ stages: 
  -   unzip $PYTEST_CACHE_ARTIFACT

  - fi



.ivas-pytest-on-merge-request-anchor: &ivas-pytest-on-merge-request-anchor

.check-regressions-pytest-anchor: &check-regressions-pytest-anchor

  stage: test

  timeout: "300 minutes"

  variables:
@@ -554,9 +557,11 @@ stages: 
    IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"

    SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"

  script:

    - set -euxo pipefail

    - *check-up-to-date-in-comparison-jobs

    - *print-common-info



    - set -euxo pipefail



    - if [ -s $FAILED_TESTCASES_LIST ]; then

    -   *overwrite-pytest-cache-with-artifact

    -   export PYTEST_ADDOPTS=--last-failed
@@ -1042,7 +1047,7 @@ check-regressions-short-enc-0db: 
    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

    - rm -rf tests/dut tests/ref

  <<: *ivas-pytest-on-merge-request-anchor

  <<: *check-regressions-pytest-anchor



check-regressions-short-enc-+10db:

  stage: test
@@ -1058,7 +1063,7 @@ check-regressions-short-enc-+10db: 
    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=3.162

    - rm -rf tests/dut tests/ref

  <<: *ivas-pytest-on-merge-request-anchor

  <<: *check-regressions-pytest-anchor



check-regressions-short-enc--10db:

  stage: test
@@ -1074,7 +1079,7 @@ check-regressions-short-enc--10db: 
    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=0.3162

    - rm -rf tests/dut tests/ref

  <<: *ivas-pytest-on-merge-request-anchor

  <<: *check-regressions-pytest-anchor



check-regressions-short-dec-0db:

  stage: test
@@ -1090,7 +1095,7 @@ check-regressions-short-dec-0db: 
    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

    - rm -rf tests/dut tests/ref

  <<: *ivas-pytest-on-merge-request-anchor

  <<: *check-regressions-pytest-anchor



check-regressions-short-dec-+10db:

  stage: test
@@ -1106,7 +1111,7 @@ check-regressions-short-dec-+10db: 
    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

    - rm -rf tests/dut tests/ref

  <<: *ivas-pytest-on-merge-request-anchor

  <<: *check-regressions-pytest-anchor



check-regressions-short-dec--10db:

  stage: test
@@ -1122,7 +1127,7 @@ check-regressions-short-dec--10db: 
    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

    - rm -rf tests/dut tests/ref

  <<: *ivas-pytest-on-merge-request-anchor

  <<: *check-regressions-pytest-anchor



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

# Short test jobs for running from web interface or schedule