diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml index acef8ec4af255986f8e3d52e749fee26a0c0b9b8..73eff4fa1773da4a62228058c1af34c4f3586b25 100644 --- a/ci-templates/industrial-ci-templates.yml +++ b/ci-templates/industrial-ci-templates.yml @@ -21,6 +21,7 @@ DOCKER_PUSH_NAME: ${CI_PROJECT_PATH} DOCKER_PUSH_TAG: ${CI_COMMIT_REF_NAME} DDEPLOY_YAML: ddeploy.yaml + GITLAB_TEMPLATES_BRANCH: master before_script: - apk add --update python3 git py3-pip git-lfs bash curl jq # forward the SSH authentication into the Docker executor @@ -42,7 +43,7 @@ - ddeploy --yaml ${DDEPLOY_YAML} # Get ID of image created by ddeploy - 'DOCKER_ID=$(docker images --format="{{.ID}}" | head -1)' - - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/enforce_labels.bash | bash -s -- ${DOCKER_ID} + - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/enforce_labels.bash | bash -s -- ${DOCKER_ID} # Tag and push with the branch or tag name. - echo "Pushing to ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}" - docker tag ${DOCKER_ID} ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}