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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tecnalia_robotics-public
templates
Merge requests
!27
Use the tagged docker images according to the rosdistro
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Use the tagged docker images according to the rosdistro
use-tagged-docker-images
into
master
Overview
1
Commits
4
Pipelines
3
Changes
2
Merged
Use the tagged docker images according to the rosdistro
Jon Azpiazu
requested to merge
use-tagged-docker-images
into
master
Jun 12, 2019
Overview
1
Commits
4
Pipelines
3
Changes
2
Related to
https://git.code.tecnalia.com/tecnalia_robotics/common_config/merge_requests/41
Edited
Nov 4, 2019
by
Jon Azpiazu
0
0
Merge request reports
Compare
master
version 2
fb51851c
Nov 4, 2019
version 1
c7fa72ba
Jun 12, 2019
master (base)
and
version 2
latest version
502d8cf9
4 commits,
Nov 4, 2019
version 2
fb51851c
3 commits,
Nov 4, 2019
version 1
c7fa72ba
1 commit,
Jun 12, 2019
2 files
+
29
−
9
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+
9
−
6
View file @ fb51851c
Edit in single-file editor
Open in Web IDE
Show full file
@@ -15,7 +15,7 @@ stages:
before_script
:
-
apk add --update bash coreutils tar wget python
.industrial_ci
_kinetic
:
.industrial_ci
:
stage
:
build
before_script
:
-
apk add --update bash coreutils tar
@@ -24,9 +24,7 @@ before_script:
script
:
.ci_config/gitlab.sh
variables
:
ADDITIONAL_DEBS
:
curl
ROS_DISTRO
:
kinetic
ROS_PARALLEL_JOBS
:
-j2
# keep this for now, since there seems to be memory limit issues in the ci VM
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
when
:
always
@@ -34,14 +32,19 @@ before_script:
-
docker
industrial_ci_kinetic
:
extends
:
.industrial_ci_kinetic
extends
:
.industrial_ci
variables
:
ROS_DISTRO
:
kinetic
DOCKER_IMAGE
:
"
${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except
:
-
tags
industrial_ci_kinetic_deploy
:
extends
:
.industrial_ci
_kinetic
extends
:
.industrial_ci
variables
:
AFTER_SCRIPT
:
wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash
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"
DOCKER_COMMIT
:
industrial_ci_image
script
:
-
.ci_config/gitlab.sh
Loading