diff --git a/.gitlab/ci/download/select_jobs.gitlab-ci.yml b/.gitlab/ci/download/select_jobs.gitlab-ci.yml index 3b7622bf12a23a7d9670f3dac8340b582771a1f8..6cce7c6908079c362644d2f68bd6c34b95a1665f 100644 --- a/.gitlab/ci/download/select_jobs.gitlab-ci.yml +++ b/.gitlab/ci/download/select_jobs.gitlab-ci.yml @@ -55,14 +55,13 @@ echo "*************************************************************************" echo "*************************************************************************" echo "**" - echo "** CHOOSING WHICH BRANCH TO PULL" + echo "** CHOOSING WHICH BRANCH / RELEASE / REF TO PULL" echo "**" echo "*************************************************************************" echo "*************************************************************************" DEFAULT_BRANCH="dev" # default branch to pull BRANCH_TO_PULL=$DEFAULT_BRANCH # default branch to pull echo "Default branch to pull : $BRANCH_TO_PULL" - echo "Retrieving branches of $DEP_NAME \"$DEP_API_URL/repository/branches\"" echo "Choosing a branch / tag to pull dependending if we are in a Non draft merge request or not." echo "CI_COMMIT_TAG = $CI_COMMIT_TAG" echo "CI_MERGE_REQUEST_ID = $CI_MERGE_REQUEST_ID" @@ -71,6 +70,7 @@ ################################ # CASE NON DRAFT MERGE REQUEST if [[ ! -z "$CI_MERGE_REQUEST_ID" && "$CI_MERGE_REQUEST_TITLE" != *'Draft'* ]]; then # case we are in a merge request + echo "Retrieving branches of $DEP_NAME \"$DEP_API_URL/repository/branches?per_page=100\"" DEP_BRANCHES=$(curl -s "$DEP_API_URL/repository/branches?per_page=100") # If the MR is not in draft: pulling from target branch (if exists otherwise dev) echo "NON DRAFT MERGE REQUEST Pipeline detected : Pulling from CI_MERGE_REQUEST_TARGET_BRANCH_NAME \"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME\"." @@ -115,7 +115,8 @@ # CASE CASUAL COMMIT or Draft MR PIPELINE else # checking if a branch with same name exists in $DEP_NAME, otherwise, pulling from DEV - DEP_BRANCHES=$(curl -s "$DEP_API_URL/repository/branches") + echo "Retrieving branches of $DEP_NAME \"$DEP_API_URL/repository/branches?per_page=100\"" + DEP_BRANCHES=$(curl -s "$DEP_API_URL/repository/branches?per_page=100") echo "Looking for branch $CI_COMMIT_BRANCH in repo $DEP_NAME" FILTERED_BRANCHES=$(jq --arg branch "$CI_COMMIT_REF_NAME" 'map(select( .name == $branch ))' <<<"$DEP_BRANCHES") if [[ $(jq length <<<$FILTERED_BRANCHES) -gt 0 ]]; then