diff --git a/.gitlab/ci/shared_test.gitlab-ci.yml b/.gitlab/ci/shared_test.gitlab-ci.yml index de1a31576cc57496b4e3d6bac952d125dede0421..74eee42d92047cd357911eaa62fa2287a46527b3 100644 --- a/.gitlab/ci/shared_test.gitlab-ci.yml +++ b/.gitlab/ci/shared_test.gitlab-ci.yml @@ -7,36 +7,18 @@ shared_job: .download_dependency: script: - - - echo "https://gitlab.eclipse.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/main/download?job=$JOB" - - echo "https://gitlab.eclipse.org/eclipse/aidge/$DEPENDENCY_NAME/-/tree/$CI_COMMIT_REF_NAME" # Check if a branch with the same name exist on the dependance repository - - RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "https://gitlab.eclipse.org/eclipse/aidge/$DEPENDENCY_NAME/-/tree/$CURRENT_BRANCH") + - RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "https://gitlab.eclipse.org/eclipse/aidge/$DEPENDENCY_NAME/-/tree/$CI_COMMIT_REF_NAME") - > - if [ "$RESPONSE_CODE" -eq 404 ] || [ "$CI_MERGE_REQUEST_ID" ]; then - echo "default to main branch" - curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/main/download?job=build:ubuntu_cpp" + if [ "$CI_MERGE_REQUEST_ID" ]; then + # Pulling from target branch + curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME/download?job=$JOB" + elif [ "$RESPONSE_CODE" -eq 404 ]; then + # Pulling from main + curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/main/download?job=$JOB" else - echo "pull from ${CURRENT_BRANCH}" - curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/$CURRENT_BRANCH/download?job=$JOB" + # Pulling from branch with same name + echo "pull from ${CI_COMMIT_REF_NAME}" + curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/$CI_COMMIT_REF_NAME/download?job=$JOB" fi -# variables: -# MY_CUSTOM_FUNCTION: > -# function my_custom_function() { -# local DEPENDENCY_NAME="$1" -# local BRANCH_NAME="$2" -# local JOB="$3" -# local GROUP_ID=$(curl "https://gitlab.eclipse.org/api/v4/groups?search=aidge" | jq -r '.[0].id') -# echo "GROUP_ID $GROUP_ID " -# local PROJECT_ID=$(curl "https://gitlab.eclipse.org/api/v4/groups/$GROUP_ID/projects?search=$DEPENDENCY_NAME" | jq -r '.[0].id') -# echo "project $DEPENDENCY_NAME id = $PROJECT_ID" - -# # # Check if a branch with the same name exist on the dependance repository -# # - RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "https://gitlab.eclipse.org/eclipse/aidge/${DEPENDENCY}/-/tree/${CI_COMMIT_BRANCH}") -# # - > -# # if [ "$RESPONSE_CODE" -eq 404 ] || [ "$CI_MERGE_REQUEST_ID" ]; then -# # curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/${PROJECT_ID}/jobs/artifacts/main/download?job=build:ubuntu_cpp" -# # else -# # curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/${PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${JOB}" -# # fi -# } + - unzip -o build_artifacts.zip -d .