Commit b7b47a51 authored by norvell's avatar norvell
Browse files

Use CI_COMMIT_BRANCH instead of CI_DEFAULT_BRANCH for testing in this branch

parent f6a2f4a5

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -1684,7 +1684,7 @@ ivas-long-term-job-logs: 
    - fi



    # handle case where the job is running for the first time. e.g where the job was not found.

    - id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH "$CI_JOB_NAME" $CI_PROJECT_ID)

    - id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_BRANCH "$CI_JOB_NAME" $CI_PROJECT_ID)

    - echo "Job ID from variables - "$CI_JOB_NAME", Job ID from script - $id_previous"



    - if [ "$id_previous" != "-1" ]; then
@@ -1704,7 +1704,7 @@ ivas-long-term-job-logs: 
    - job_names="ivas-pytest-compare_ref-long-enc ivas-pytest-compare_ref-long-enc-lev+10 ivas-pytest-compare_ref-long-enc-lev-10 ivas-pytest-compare_ref-long-dec ivas-pytest-compare_ref-long-dec-lev+10 ivas-pytest-compare_ref-long-dec-lev-10 ivas-pytest-compare_ref-long-fx-fx ivas-pytest-compare_ref-long-fx-fx-lev+10 ivas-pytest-compare_ref-long-fx-fx-lev-10"

    - for job_name in $job_names; do

    -   echo "Getting job logs for: $job_name"

    -   id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH "$job_name" $CI_PROJECT_ID)

    -   id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_BRANCH "$job_name" $CI_PROJECT_ID)

    -   echo "Job ID from variables - "$job_name", Job ID from script - $id_previous"

    -   curl --request GET "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$id_previous/artifacts" --output artifacts.zip

    -   unzip artifacts.zip -d previous_artifacts
@@ -1744,7 +1744,7 @@ backup-long-term-job-logs: 
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh



    # Find ID of last run of ivas-long-term-job-logs

    - id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH ivas-long-term-job-logs $CI_PROJECT_ID)

    - id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_BRANCH ivas-long-term-job-logs $CI_PROJECT_ID)



    - if [ "$id_previous" != "-1" ]; then

        # Unzip artifacts to recover past logs dir