Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
templates
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tecnalia_robotics-public
templates
Commits
b66b6804
Commit
b66b6804
authored
1 year ago
by
Jon Azpiazu
Browse files
Options
Downloads
Plain Diff
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
!82
Resolve "Some jobs running with docker service even if not needed."
Pipeline
#134881
passed
1 year ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ci-templates/core.yml
+0
-7
0 additions, 7 deletions
ci-templates/core.yml
ci-templates/industrial-ci-templates.yml
+6
-0
6 additions, 0 deletions
ci-templates/industrial-ci-templates.yml
ci-templates/syntax-check.yml
+9
-3
9 additions, 3 deletions
ci-templates/syntax-check.yml
with
15 additions
and
10 deletions
ci-templates/core.yml
+
0
−
7
View file @
b66b6804
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
ci-templates/industrial-ci-templates.yml
+
6
−
0
View file @
b66b6804
...
@@ -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}
...
...
This diff is collapsed.
Click to expand it.
ci-templates/syntax-check.yml
+
9
−
3
View file @
b66b6804
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment