Commit 3263ad0d authored by Jan Kiene's avatar Jan Kiene
Browse files

rename script and job for clarity

parent d5cf34c3

main-basop.yml

+2 −2
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ fail-pipeline-if-in-draft: 
    - echo "Your MR is still in Draft state, set it to ready to be mergable, then retrigger the pipeline."

    - exit 1



check-float-ref-companion-branch-exists-for-porting-merge-requests:

check-for-parallel-branch-in-float-repo:

  extends:

    - .rules-merge-request-to-main

    - .job-linux
@@ -932,7 +932,7 @@ check-float-ref-companion-branch-exists-for-porting-merge-requests: 
    - ivas-linux

  script:

  # we need to source the script here so that the correct exit code is returned from the global job shell and the "allow_failure" recognizes it

  - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/check-float-ref-companion-branch-exists-for-porting-merge-requests.sh

  - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/check-for-parallel-branch-in-float-repo.sh

  allow_failure:

    exit_codes:

      - 123

snippets/basop/branch-is-up-to-date-with-target-pre.sh

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ exit_code_follows_naming_conventions=0 
bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/branch-follows-porting-naming-convention.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME >>/dev/null || exit_code_follows_naming_conventions=$?



exit_code_companion_branch_exists=0

bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/check-float-ref-companion-branch-exists-for-porting-merge-requests.sh || exit_code_companion_branch_exists=$?

bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/check-for-parallel-branch-in-float-repo.sh || exit_code_companion_branch_exists=$?



if [[ "$exit_code_follows_naming_conventions" == "0" ]] && [[ "$exit_code_companion_branch_exists" == "0" ]]; then

  float_ref_branchname_in_ivas_codec=$CI_COMMIT_REF_NAME