diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index e1364d3cbc..a07ec2da55 100644 --- a/.ci/Jenkinsfile-SITL_tests +++ b/.ci/Jenkinsfile-SITL_tests @@ -147,7 +147,7 @@ pipeline { stage('code coverage (python)') { agent { docker { - image 'px4io/px4-dev-base:2018-11-22' + image 'px4io/px4-dev-base:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE' } } @@ -170,7 +170,7 @@ pipeline { stage('unit tests') { agent { docker { - image 'px4io/px4-dev-base:2018-11-22' + image 'px4io/px4-dev-base:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE' } } diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index d7466aa083..01aa237ac5 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -9,12 +9,12 @@ pipeline { script { def build_nodes = [:] def docker_images = [ - arch: "px4io/px4-dev-base-archlinux:2018-11-22", - armhf: "px4io/px4-dev-armhf:2018-09-11", - base: "px4io/px4-dev-base:2018-11-22", - nuttx: "px4io/px4-dev-nuttx:2018-09-11", - ros: "px4io/px4-dev-ros:2018-11-22", - rpi: "px4io/px4-dev-raspi:2018-11-22", + arch: "px4io/px4-dev-base-archlinux:2019-01-01", + armhf: "px4io/px4-dev-armhf:2019-01-01", + base: "px4io/px4-dev-base:2019-01-01", + nuttx: "px4io/px4-dev-nuttx:2019-01-01", + ros: "px4io/px4-dev-ros:2019-01-01", + rpi: "px4io/px4-dev-raspi:2019-01-01", snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" ] @@ -134,7 +134,7 @@ pipeline { // TODO: actually upload artifacts to S3 stage('S3 Upload') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } options { skipDefaultCheckout() diff --git a/Jenkinsfile b/Jenkinsfile index 3a7186c2ed..73ec9825a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { stage('Catkin build on ROS workspace') { agent { docker { - image 'px4io/px4-dev-ros:2018-11-22' + image 'px4io/px4-dev-ros:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -19,17 +19,17 @@ pipeline { echo $0; mkdir -p catkin_ws/src; cd catkin_ws; - // ln -s Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo; + git clone --recursive https://github.com/PX4/sitl_gazebo.git src/mavlink_sitl_gazebo; source /opt/ros/melodic/setup.bash; catkin init; catkin build -j$(nproc) -l$(nproc); ''' // test if the binary was correctly installed and runs using 'mavros_posix_silt.launch' - //sh '''#!/bin/bash -l - // echo $0; - // source catkin_ws/devel/setup.bash; - // rostest px4 pub_test.launch; - //''' + sh '''#!/bin/bash -l + echo $0; + source catkin_ws/devel/setup.bash; + rostest px4 pub_test.launch; + ''' } post { always { @@ -44,7 +44,7 @@ pipeline { stage('Colcon build on ROS2 workspace') { agent { docker { - image 'px4io/px4-dev-ros2-bouncy:2018-11-22' + image 'px4io/px4-dev-ros2-bouncy:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -55,8 +55,9 @@ pipeline { unset ROS_DISTRO; mkdir -p colcon_ws/src; cd colcon_ws; - // ln -s Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo; + git clone --recursive https://github.com/PX4/sitl_gazebo.git src/mavlink_sitl_gazebo; source /opt/ros/bouncy/setup.sh; + source /opt/ros/melodic/setup.sh; colcon build --event-handlers console_direct+ --symlink-install; ''' } @@ -72,7 +73,7 @@ pipeline { stage('Style check') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh 'make check_format' @@ -87,7 +88,7 @@ pipeline { stage('Bloaty px4_fmu-v2') { agent { docker { - image 'px4io/px4-dev-nuttx:2018-11-22' + image 'px4io/px4-dev-nuttx:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -115,7 +116,7 @@ pipeline { stage('Bloaty px4_fmu-v5') { agent { docker { - image 'px4io/px4-dev-nuttx:2018-11-22' + image 'px4io/px4-dev-nuttx:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -143,7 +144,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2018-11-22' + image 'px4io/px4-dev-clang:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -201,7 +202,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-base:2018-11-22' + image 'px4io/px4-dev-base:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -238,7 +239,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx:2018-11-22' + image 'px4io/px4-dev-nuttx:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -257,7 +258,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx:2018-11-22' + image 'px4io/px4-dev-nuttx:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -276,7 +277,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base:2018-11-22' + image 'px4io/px4-dev-base:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -301,7 +302,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh 'make distclean' @@ -320,7 +321,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh 'make distclean' @@ -339,7 +340,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh 'make distclean' @@ -359,7 +360,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx:2018-11-22' + image 'px4io/px4-dev-nuttx:2019-01-01' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -388,7 +389,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh('export') @@ -418,7 +419,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh('export') @@ -446,7 +447,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh('export') @@ -474,7 +475,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base:2018-11-22' } + docker { image 'px4io/px4-dev-base:2019-01-01' } } steps { sh('export')