Merge branch '52-ddeploy-job-failing-when-enforcing-labels-alt'

ci-templates/industrial-ci-templates.yml

@@ -13,7 +13,6 @@ variables:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     ADDITIONAL_DEBS: curl
     PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM
-    GITLAB_TEMPLATES_BRANCH: master
     AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/ci_run_entry_points.sh) $$current_ws"
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
 
@@ -25,7 +24,6 @@ variables:
     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