CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-30 14:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_builder: add param for discover packages

Browse Source
This commit is contained in:
Artem Smirnov
2018-06-21 15:39:21 +03:00
parent 24e79f0169
commit b71a96faee
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
image_builder/build.Jenkinsfile
View File

@@ -15,6 +15,7 @@ pipeline {
// Experimental function
booleanParam(name: 'SHRINK', defaultValue: false, description: 'SHRINK IMAGE')
booleanParam(name: 'DISCOVER_ROS_PACKAGES', defaultValue: false, description: 'DISCOVER ROS PACKAGES')
}
environment {
DEBIAN_FRONTEND = 'noninteractive'
@@ -74,8 +75,8 @@ pipeline {
MOVE_FILE = 'image_builder/kinetic-ros-coex.rosinstall'
}
steps {
sh "$WORKSPACE/image_builder/image_config.sh copy_to_chroot ${params.BUILD_DIR}/${params.IMAGE_NAME} ${params.MOUNT_POINT} $WORKSPACE/$MOVE_FILE"
sh "$WORKSPACE/image_builder/image_config.sh execute ${params.BUILD_DIR}/${params.IMAGE_NAME} ${params.MOUNT_POINT} $WORKSPACE/$EXECUTE_FILE ${params.GWBT_URL} DONT_DISCOVER"
sh "if ! ${params.DISCOVER_ROS_PACKAGES}; then $WORKSPACE/image_builder/image_config.sh copy_to_chroot ${params.BUILD_DIR}/${params.IMAGE_NAME} ${params.MOUNT_POINT} $WORKSPACE/$MOVE_FILE; fi"
sh "$WORKSPACE/image_builder/image_config.sh execute ${params.BUILD_DIR}/${params.IMAGE_NAME} ${params.MOUNT_POINT} $WORKSPACE/$EXECUTE_FILE ${params.GWBT_URL} ${params.DISCOVER_ROS_PACKAGES}"
}
}
// TODO: Add finalising step, transfer mirror removal from ros.sh

4
image_builder/scripts/ros_install.sh
View File

@@ -42,8 +42,8 @@ echo -e "\033[0;31m\033[1m$(date) | #4 rosdep init && rosdep update\033[0m\033[0
# bootstrap rosdep
rosdep init && rosdep update
# If $2 not used, then discover packages
if [[ -z $2 ]];
# If $2 = false, then discover packages
if [ "$2" = "false" ];
then
echo -e "\033[0;31m\033[1m$(date) | #5 Preparing ros_comm packages to kinetic-ros_comm-wet.rosinstall\033[0m\033[0m"