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

Merge branch 'use-cmake-args' into 'master' 

Use new CMAKE_ARGS variable introduced in industrial_ci#369

See merge request tecnalia_robotics-public/gitlab_templates!24
parents 58ffc91f 701c80c4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 2
− 2
View file @ b9934219
shellcheck: shellcheck:
image: koalaman/shellcheck-alpine image: koalaman/shellcheck-alpine
script: 'shellcheck deploy/base/ros_entrypoint.bash scripts/*sh' script: shellcheck deploy/base/ros_entrypoint.bash scripts/*sh
# The ignored rules in hadolint checks are # The ignored rules in hadolint checks are
# DL3006 Always tag the version of an image explicitly # DL3006 Always tag the version of an image explicitly
...@@ -19,4 +19,4 @@ dockerfiles: ...@@ -19,4 +19,4 @@ dockerfiles:
yamllint: yamllint:
image: sdesbure/yamllint image: sdesbure/yamllint
script: "yamllint $(find . \\( -name '*.yml' -o -name '*.yaml' \\))" script: yamllint $(find . -name '*.yml' -o -name '*.yaml')
.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+ 7
− 7
View file @ b9934219
image: docker:git image: docker:git
variables: 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: services:
- docker:dind - docker:dind
...@@ -25,10 +25,10 @@ before_script: ...@@ -25,10 +25,10 @@ before_script:
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM 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" 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" 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
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --' CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
when: always when: always
industrial_ci_kinetic: industrial_ci_kinetic:
...@@ -39,7 +39,7 @@ industrial_ci_kinetic: ...@@ -39,7 +39,7 @@ industrial_ci_kinetic:
industrial_ci_kinetic_deploy: industrial_ci_kinetic_deploy:
extends: .industrial_ci_kinetic extends: .industrial_ci_kinetic
variables: variables:
AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash" 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 DOCKER_COMMIT: industrial_ci_image
script: script:
- .ci_config/gitlab.sh - .ci_config/gitlab.sh
......
.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+ 8
− 8
View file @ b9934219
image: docker:git image: docker:git
variables: 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: services:
- docker:dind - docker:dind
...@@ -25,12 +25,12 @@ before_script: ...@@ -25,12 +25,12 @@ before_script:
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM ROS_PARALLEL_JOBS: -j2 # keep this for now, since there seems to be memory limit issues in the ci VM
UPSTREAM_WORKSPACE: file UPSTREAM_WORKSPACE: file
ROSINSTALL_FILENAME: ".rosinstall" ROSINSTALL_FILENAME: .rosinstall
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel" 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" 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
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --' CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
when: always when: always
industrial_ci_kinetic: industrial_ci_kinetic:
...@@ -41,7 +41,7 @@ industrial_ci_kinetic: ...@@ -41,7 +41,7 @@ industrial_ci_kinetic:
industrial_ci_kinetic_deploy: industrial_ci_kinetic_deploy:
extends: .industrial_ci_kinetic extends: .industrial_ci_kinetic
variables: variables:
AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash" 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 DOCKER_COMMIT: industrial_ci_image
script: script:
- .ci_config/gitlab.sh - .ci_config/gitlab.sh
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment