Skip to content
Snippets Groups Projects
Commit b66b6804 authored by Jon Azpiazu's avatar Jon Azpiazu
Browse files

Merge branch 'remove-docker-service' into 'master'

Resolve "Some jobs running with docker service even if not needed."

Closes #51

See merge request !82
parents 521e2d78 6802fed8
No related branches found
No related tags found
1 merge request!82Resolve "Some jobs running with docker service even if not needed."
Pipeline #134881 passed
...@@ -10,18 +10,11 @@ variables: ...@@ -10,18 +10,11 @@ variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE} TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch 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: stages:
- build - build
- deploy - 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: include:
- ci-templates/syntax-check.yml - ci-templates/syntax-check.yml
- ci-templates/industrial-ci-templates.yml - ci-templates/industrial-ci-templates.yml
......
...@@ -3,6 +3,9 @@ variables: ...@@ -3,6 +3,9 @@ variables:
.industrial_ci: .industrial_ci:
stage: build stage: build
services:
- name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
alias: docker
before_script: before_script:
- apk add --update bash coreutils tar - apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
...@@ -19,6 +22,9 @@ variables: ...@@ -19,6 +22,9 @@ variables:
.ddeploy: .ddeploy:
stage: deploy stage: deploy
services:
- name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
alias: docker
variables: variables:
DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL} DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL}
DOCKER_PUSH_NAME: ${CI_PROJECT_PATH} DOCKER_PUSH_NAME: ${CI_PROJECT_PATH}
......
...@@ -6,6 +6,9 @@ variables: ...@@ -6,6 +6,9 @@ variables:
########################################################## ##########################################################
clang_format: clang_format:
stage: .post stage: .post
services:
- name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
alias: docker
before_script: before_script:
- apk add --update bash coreutils tar wget - apk add --update bash coreutils tar wget
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
...@@ -53,7 +56,9 @@ bash_syntax: ...@@ -53,7 +56,9 @@ bash_syntax:
########################################################## ##########################################################
markdown_syntax: markdown_syntax:
stage: .post 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 when: always
########################################################## ##########################################################
...@@ -64,10 +69,11 @@ markdown_syntax: ...@@ -64,10 +69,11 @@ markdown_syntax:
########################################################## ##########################################################
file_syntax: file_syntax:
stage: .post stage: .post
image: tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci
script: script:
- RET=0 - 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 - file-trailing-space --path=${PWD} --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-utf8 --path=${PWD} --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
- exit $RET - exit $RET
when: always when: always
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment