From c4f3c30f0568d380cad40366651b2eb45e7d356b Mon Sep 17 00:00:00 2001 From: cmoineau <cyril.moineau@cea.fr> Date: Wed, 31 Jan 2024 10:03:04 +0000 Subject: [PATCH] fix typo and comment artifact fetching --- .gitlab/ci/shared_test.gitlab-ci.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitlab/ci/shared_test.gitlab-ci.yml b/.gitlab/ci/shared_test.gitlab-ci.yml index fa76669..f12b256 100644 --- a/.gitlab/ci/shared_test.gitlab-ci.yml +++ b/.gitlab/ci/shared_test.gitlab-ci.yml @@ -1,4 +1,3 @@ - stages: - shared @@ -11,20 +10,18 @@ variables: function my_custom_function() { local DEPENDENCY_NAME="$1" local BRANCH_NAME="$2" - local JOB="$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 + # # 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 } -- GitLab