Merge branch 'master' into use-tagged-docker-images

.gitlab-ci.yml

 shellcheck:
   image: koalaman/shellcheck-alpine
-  script: 'shellcheck deploy/base/ros_entrypoint.bash scripts/*sh'
+  script: shellcheck deploy/base/ros_entrypoint.bash scripts/*sh
+  tags:
+    - docker
 
 # The ignored rules in hadolint checks are
 # DL3006 Always tag the version of an image explicitly
@@ -16,7 +18,11 @@ dockerfiles:
     - hadolint --ignore DL3006 --ignore DL3008 deploy/base/Dockerfile || RET=1
     - hadolint --ignore DL3006 --ignore DL3008 deploy/dev/Dockerfile || RET=1
     - exit $RET
+  tags:
+    - docker
 
 yamllint:
   image: sdesbure/yamllint
-  script: "yamllint $(find . \\( -name '*.yml' -o -name '*.yaml' \\))"
+  script: yamllint $(find . -name '*.yml' -o -name '*.yaml')
+  tags:
+    - docker

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

 image: docker:git
 
 variables:
-  TMPDIR: "/builds/${CI_PROJECT_NAMESPACE}"
-  GIT_LFS_SKIP_SMUDGE: "1" # Avoid fetching the files from LFS when doing git fetch
+  TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
+  GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
 
 services:
   - docker:dind
@@ -24,10 +24,12 @@ before_script:
   script: .ci_config/gitlab.sh
   variables:
     ADDITIONAL_DEBS: curl
-    ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
-    BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE"
-    CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
+    ROS_PARALLEL_JOBS: -j2 # keep this for now, since there seems to be memory limit issues in the ci VM
+    BEFORE_SCRIPT: bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE
+    CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
   when: always
+  tags:
+    - docker
 
 industrial_ci_kinetic:
   extends: .industrial_ci
@@ -69,6 +71,8 @@ python_syntax:
   stage: precheck
   script: python -m compileall -q .
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in bash/sh scripts
@@ -83,6 +87,8 @@ bash_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in markdown files
@@ -96,6 +102,8 @@ markdown_syntax:
   script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013"
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for various syntax issues in files; currently
@@ -112,3 +120,5 @@ file_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker

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

 image: docker:git
 
 variables:
-  TMPDIR: "/builds/${CI_PROJECT_NAMESPACE}"
-  GIT_LFS_SKIP_SMUDGE: "1" # Avoid fetching the files from LFS when doing git fetch
+  TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
+  GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
 
 services:
   - docker:dind
@@ -24,12 +24,24 @@ before_script:
   script: .ci_config/gitlab.sh
   variables:
     ADDITIONAL_DEBS: curl
+<<<<<<< HEAD
     ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
     UPSTREAM_WORKSPACE: file
     ROSINSTALL_FILENAME: ".rosinstall"
     BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
+=======
+    ROS_DISTRO: kinetic
+    ROS_PARALLEL_JOBS: -j2 # keep this for now, since there seems to be memory limit issues in the ci VM
+    UPSTREAM_WORKSPACE: file
+    ROSINSTALL_FILENAME: .rosinstall
+    DOCKER_IMAGE: ${ARTIFACT_DOCKER_URL}/flexbotics-base-devel
+    BEFORE_SCRIPT: bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE
+    CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
+>>>>>>> master
   when: always
+  tags:
+    - docker
 
 industrial_ci_kinetic:
   extends: .industrial_ci
@@ -42,9 +54,13 @@ industrial_ci_kinetic:
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci
   variables:
+<<<<<<< HEAD
     ROS_DISTRO: kinetic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/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
+>>>>>>> master
     DOCKER_COMMIT: industrial_ci_image
   script:
     - .ci_config/gitlab.sh
@@ -71,6 +87,8 @@ python_syntax:
   stage: precheck
   script: python -m compileall -q .
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in bash/sh scripts
@@ -85,6 +103,8 @@ bash_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in markdown files
@@ -98,6 +118,8 @@ markdown_syntax:
   script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013"
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for various syntax issues in files; currently
@@ -114,3 +136,5 @@ file_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker

.gitlab-industrial-ci.yml

-image: docker:git
-
-variables:
-  TMPDIR: "${CI_PROJECT_DIR}.tmp"
-
-services:
-  - docker:dind
-
-stages:
-  - build
-
-before_script:
-  - apk add --update bash coreutils tar wget
-  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
-
-industrial_ci_kinetic:
-  stage: build
-  script: .ci_config/gitlab.sh
-  variables:
-    ROS_DISTRO: kinetic
-    ROS_PARALLEL_JOBS: "-j1" # keep this for now, since there seems to be memory limit issues in the ci VM

deploy/dev/Dockerfile

@@ -5,6 +5,7 @@ RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
   apt-transport-https \
   curl \
   libasound2 \
+  ca-certificates \
   && rm -rf /var/lib/apt/lists/*
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -19,9 +20,9 @@ RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
 RUN echo "alias code='code --user-data-dir /root'" >> /root/.bashrc
 
 RUN code --user-data-dir /root \
-  --install-extension ajshort.ros \
+  --install-extension ms-iot.vscode-ros \
   --install-extension joaompinto.asciidoctor-vscode \
   --install-extension ms-python.python \
   --install-extension ms-vscode.cpptools \
-  --install-extension peterjausovec.vscode-docker \
+  --install-extension ms-azuretools.vscode-docker \
   --install-extension twxs.cmake

rosdistro/rosdep_tecnalia.yaml

@@ -17,6 +17,9 @@ robotnik_base_hw_lib:
 telicam-sdk:
   ubuntu: [telicam-sdk]
 
+telicam-1.1.0:
+  ubuntu: [libtelicam-sdk-1.1.0]
+
 zivid:
   ubuntu: [zivid]