Build and push deploy image in 'script' instead of 'after_script'

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

@@ -40,7 +40,8 @@ industrial_ci_kinetic_deploy:
   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"
     DOCKER_COMMIT: industrial_ci_image
-  after_script:
+  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

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

@@ -42,7 +42,8 @@ industrial_ci_kinetic_deploy:
   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"
     DOCKER_COMMIT: industrial_ci_image
-  after_script:
+  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