From 91413d7d172468621da2fedd7a1e428a3d08a26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= Date: Wed, 1 Sep 2021 10:21:29 +0200 Subject: [PATCH 1/5] Migrate industrial-ci to master --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 6 +++--- .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 14ba3a9..c659a2f 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -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_JOBS: -j2 # 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_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM + AFTER_SETUP_UPSTREAM_WORKSPACE: rosenv && 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 tags: - docker diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 490770c..dee46b9 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -25,17 +25,16 @@ 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_FILENAME: ".rosinstall" - 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 --' + 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_WORKSPACE: "rosenv && 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' tags: - docker -- GitLab From 14530d89b7d1c2eca755a5a7d10a98c6f17d520e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= Date: Wed, 1 Sep 2021 10:55:02 +0200 Subject: [PATCH 2/5] Modify ros_entrypoint for deployment --- deploy/base/ros_entrypoint.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/base/ros_entrypoint.bash b/deploy/base/ros_entrypoint.bash index 0f3ec1f..df5d0f7 100755 --- a/deploy/base/ros_entrypoint.bash +++ b/deploy/base/ros_entrypoint.bash @@ -3,5 +3,5 @@ set -e # setup application environment # shellcheck disable=SC1091 -source "/root/catkin_ws/install/setup.bash" +source "/root/*_ws/install/setup.bash" exec "$@" -- GitLab From e6de06dd004c5a0ce7a055b4ed8abee350481908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= Date: Wed, 1 Sep 2021 11:08:22 +0200 Subject: [PATCH 3/5] Improve ros_entrypoint --- deploy/base/ros_entrypoint.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/base/ros_entrypoint.bash b/deploy/base/ros_entrypoint.bash index df5d0f7..ea158a5 100755 --- a/deploy/base/ros_entrypoint.bash +++ b/deploy/base/ros_entrypoint.bash @@ -3,5 +3,7 @@ set -e # setup application environment # shellcheck disable=SC1091 -source "/root/*_ws/install/setup.bash" +source "/root/target_ws/install/setup.bash" +# shellcheck disable=SC1091 +source "/root/upstream_ws/install/setup.bash" exec "$@" -- GitLab From 6e7fd7de22f3d2b5cd6d212591442b6c16f8b2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= Date: Wed, 1 Sep 2021 11:53:39 +0200 Subject: [PATCH 4/5] Fix calls to entry points --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 +- .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index c659a2f..59d085f 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -32,7 +32,7 @@ before_script: variables: ADDITIONAL_DEBS: curl PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM - AFTER_SETUP_UPSTREAM_WORKSPACE: rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE + 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 diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index dee46b9..4c24ca4 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -33,7 +33,8 @@ before_script: ADDITIONAL_DEBS: curl 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_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE" + AFTER_SETUP_UPSTREAM_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" + 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 From 183d6d3a25350e4dba7a306444d51da10e50a7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= Date: Wed, 1 Sep 2021 12:44:54 +0200 Subject: [PATCH 5/5] Remove unneccesary source of upstream_ws --- deploy/base/ros_entrypoint.bash | 2 -- 1 file changed, 2 deletions(-) diff --git a/deploy/base/ros_entrypoint.bash b/deploy/base/ros_entrypoint.bash index ea158a5..a203d40 100755 --- a/deploy/base/ros_entrypoint.bash +++ b/deploy/base/ros_entrypoint.bash @@ -4,6 +4,4 @@ set -e # setup application environment # shellcheck disable=SC1091 source "/root/target_ws/install/setup.bash" -# shellcheck disable=SC1091 -source "/root/upstream_ws/install/setup.bash" exec "$@" -- GitLab