Fix branch-specific URLs from !16

These should've been changed before merging. Oops!

.gitlab-industrial-ci-kinetic-no-rosinstall.yml

@@ -38,13 +38,13 @@ industrial_ci_kinetic:
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci_kinetic
   variables:
-    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/scripts/pre-deploy-cleanup.bash | bash"
+    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash"
     DOCKER_COMMIT: industrial_ci_image
   script:
     - .ci_config/gitlab.sh
     - cd $(mktemp -d)
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/Dockerfile
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/ros_entrypoint.bash
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/deploy/Dockerfile
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/deploy/ros_entrypoint.bash
     - chmod a+x ros_entrypoint.bash
     - docker build -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
     - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

@@ -40,13 +40,13 @@ industrial_ci_kinetic:
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci_kinetic
   variables:
-    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/scripts/pre-deploy-cleanup.bash | bash"
+    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash"
     DOCKER_COMMIT: industrial_ci_image
   script:
     - .ci_config/gitlab.sh
     - cd $(mktemp -d)
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/Dockerfile
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/ros_entrypoint.bash
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/deploy/Dockerfile
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/deploy/ros_entrypoint.bash
     - chmod a+x ros_entrypoint.bash
     - docker build -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
     - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}