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

remove other up-to-date checks

parent 30370331

.gitlab-ci.yml

+21 −21
Original line number Diff line number Diff line
@@ -238,19 +238,19 @@ check-no-duplicates-in-self-tests: 
  script:

    - python3 ci/find_duplicates_in_prm_files.py



branch-is-up-to-date-with-main-post:

  extends:

    - .rules-merge-request-to-main

    - .job-linux

  stage: postvalidate

  script:

    - |

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

      echo "Commits behind: $commits_behind_count"

      if [ "$commits_behind_count" -ne 0 ]; then

        echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update."

        exit 1

      fi

# branch-is-up-to-date-with-main-post:

#   extends:

#     - .rules-merge-request-to-main

#     - .job-linux

#   stage: postvalidate

#   script:

#     - |

#       commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)"

#       echo "Commits behind: $commits_behind_count"

#       if [ "$commits_behind_count" -ne 0 ]; then

#         echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update."

#         exit 1

#       fi



.basop-ci-branch-compat-template:

  extends:
@@ -795,8 +795,8 @@ split-rendering-pytest-on-merge-request: 
  stage: compare

  script:

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

    - commits_behind_count="$(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

    # - commits_behind_count="$(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



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

    # write to temporary file as workaround for failures observed with piping echo
@@ -877,8 +877,8 @@ ivas-pytest-on-merge-request: 
          - test_sba.py

  script:

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

    - commits_behind_count="$(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

    # - commits_behind_count="$(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



    # some helper variables - "|| true" to prevent failures from grep not finding anything
@@ -930,8 +930,8 @@ ivas-interop-on-merge-request: 
  timeout: "10 minutes"

  script:

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

    - commits_behind_count="$(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

    # - commits_behind_count="$(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

    # the next line is dependent on ref-using-main flag in the other tests, but here the flag does not make sense

    - git checkout $source_branch_commit_sha
@@ -979,8 +979,8 @@ evs-pytest-on-merge-request: 
  timeout: "10 minutes"

  script:

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

    - commits_behind_count="$(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

    # - commits_behind_count="$(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



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