Merge branch 'master' into 48-python_syntax-is-python2-only

ci-templates/core.yml

@@ -10,18 +10,11 @@ variables:
   TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
   GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
 
-services:
-  - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
-    alias: docker
 
 stages:
   - build
   - deploy
 
-before_script:
-  - apk add --update bash coreutils tar wget
-  - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-
 include:
   - ci-templates/syntax-check.yml
   - ci-templates/python.yml

ci-templates/industrial-ci-templates.yml

@@ -3,6 +3,9 @@ variables:
 
 .industrial_ci:
   stage: build
+  services:
+    - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+      alias: docker
   before_script:
     - apk add --update bash coreutils tar
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
@@ -19,6 +22,9 @@ variables:
 
 .ddeploy:
   stage: deploy
+  services:
+  - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+    alias: docker
   variables:
     DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL}
     DOCKER_PUSH_NAME: ${CI_PROJECT_PATH}
@@ -39,7 +45,8 @@ variables:
     - echo https://$ARTIFACT_CI_USER:$ARTIFACT_CI_TOKEN@artifact.tecnalia.com > ~/.git-credentials
     # install ddeploy
     - pip install git+ssh://git@git.code.tecnalia.com/tecnalia_robotics/flexbotics/flexbotics_utils/ddeploy.git@v0.2.0
-    - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
+    - echo "Logging into docker registry ${DOCKER_PUSH_REGISTRY} for user ${ARTIFACT_CI_USER}"
+    - docker login ${DOCKER_PUSH_REGISTRY} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script:
     # Run ddeploy
     - ddeploy --yaml ${DDEPLOY_YAML}

ci-templates/syntax-check.yml

@@ -6,6 +6,9 @@ variables:
 ##########################################################
 clang_format:
   stage: .post
+  services:
+    - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+      alias: docker
   before_script:
     - apk add --update bash coreutils tar wget
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
@@ -41,7 +44,9 @@ bash_syntax:
 ##########################################################
 markdown_syntax:
   stage: .post
-  script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
+  image: tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci
+  script:
+    - syntax-markdown --path=${PWD} --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
   when: always
 
 ##########################################################
@@ -52,10 +57,11 @@ markdown_syntax:
 ##########################################################
 file_syntax:
   stage: .post
+  image: tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci
   script:
     - RET=0
-    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
-    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - file-trailing-space --path=${PWD} --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - file-utf8 --path=${PWD} --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
     - exit $RET
   when: always
 

rosdistro/rosdep_tecnalia.yaml

@@ -28,12 +28,12 @@ telicam-1.1.0:
 zivid:
   ubuntu: [zivid]
 
+zivid1.8:
+  ubuntu: [zivid1.8]
+
 zivid_telicam_driver:
   ubuntu: [zivid-telicam-driver]
 
-zivid_camera:
-  ubuntu: [ros-kinetic-zivid-camera]
-
 rccomm_utils:
   ubuntu:
     xenial: [rccomm-utils]