Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tecnalia_robotics-public
templates
Commits
a0e565ad
Commit
a0e565ad
authored
Sep 02, 2021
by
Iñigo Moreno i Caireta
Browse files
Merge remote-tracking branch 'origin/master' into 34-noetic-support
parents
3a492beb
4536c086
Pipeline
#55538
failed with stage
in 12 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-industrial-ci-kinetic-no-rosinstall.yml
View file @
a0e565ad
...
...
@@ -25,14 +25,14 @@ before_script:
stage
:
build
before_script
:
-
apk add --update bash coreutils tar
-
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
-
docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-
docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
script
:
.ci_config/gitlab.sh
variables
:
ADDITIONAL_DEBS
:
curl
ROS_
PARALLEL_
JOB
S
:
-j
2
# 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
PARALLEL_
BUILD
S
:
2
# keep this for now, since there seems to be memory limit issues in the ci VM
AFTER_SETUP_TARGET_WORKSPACE
:
rosenv &&
bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$
current_ws
CMAKE_ARGS
:
-DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
tags
:
-
docker
...
...
.gitlab-industrial-ci-kinetic-with-rosinstall.yml
View file @
a0e565ad
...
...
@@ -25,17 +25,17 @@ before_script:
stage
:
build
before_script
:
-
apk add --update bash coreutils tar
-
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
-
docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-
docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
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
UPSTREAM_WORKSPACE
:
file
ROSINSTALL_FILENAM
E
:
"
.
ros
install
"
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
"
C
ATKIN_CONFIG
:
'
--cmake-args
-DCMAKE_CXX_FLAGS=-Wno-ignored-attributes
-Wno-int-in-bool-context
--
'
PARALLEL_
BUILDS
:
2
# keep this for now, since there seems to be memory limit issues in the ci VM
UPSTREAM_WORKSPACE
:
.rosinstall
AFTER_SETUP_UPSTREAM_WORKSPAC
E
:
"
ros
env
&&
bash
<(curl
-Ls
https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh)
$$current_ws
"
AFTER_SETUP_TARGET_WORKSPACE
:
"
rosenv
&&
bash
<(curl
-Ls
https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh)
$$
current_ws
"
C
MAKE_ARGS
:
'
-DCMAKE_CXX_FLAGS=-Wno-ignored-attributes
-Wno-int-in-bool-context'
tags
:
-
docker
...
...
deploy/base/ros_entrypoint.bash
View file @
a0e565ad
...
...
@@ -3,5 +3,5 @@ set -e
# setup application environment
# shellcheck disable=SC1091
source
"/root/
catkin
_ws/install/setup.bash"
source
"/root/
target
_ws/install/setup.bash"
exec
"
$@
"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment