Skip to content

Commit

Permalink
Merge pull request #1 from PX4/master
Browse files Browse the repository at this point in the history 
Update
  • Loading branch information
@llanesc
llanesc authored Feb 2, 2019
2 parents 2ffb49b + 1d86b75 commit a14aa3b
Show file tree
Hide file tree
Showing 320 changed files with 15,074 additions and 22,625 deletions.
8 changes: 4 additions & 4 deletions .ci/Jenkinsfile-SITL_tests
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pipeline {
agent {
docker {
image 'px4io/px4-dev-ros-kinetic:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE --cap-add SYS_PTRACE'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE --cap-add SYS_PTRACE --entrypoint=""'
}
}

Expand Down Expand Up @@ -147,7 +147,7 @@ pipeline {
stage('code coverage (python)') {
agent {
docker {
image 'px4io/px4-dev-base:2019-01-01'
image 'px4io/px4-dev-base:2019-01-26'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE'
}
}
Expand All @@ -170,7 +170,7 @@ pipeline {
stage('unit tests') {
agent {
docker {
image 'px4io/px4-dev-base:2019-01-01'
image 'px4io/px4-dev-base:2019-01-26'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE'
}
}
Expand Down Expand Up @@ -211,7 +211,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE') {
docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE --entrypoint=""') {
stage(test_def.name) {
def test_ok = true
sh('export')
Expand Down
34 changes: 16 additions & 18 deletions .ci/Jenkinsfile-compile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
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",
armhf: "px4io/px4-dev-armhf:2019-01-27",
base: "px4io/px4-dev-base:2019-01-26",
nuttx: "px4io/px4-dev-nuttx:2019-01-27",
ros: "px4io/px4-dev-ros:2019-01-27",
rpi: "px4io/px4-dev-raspi:2019-01-27",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]

Expand Down Expand Up @@ -67,13 +66,6 @@ pipeline {
}
}

// docker builds:
def arch_builds = [
target: ["px4_sitl_default"],
image: docker_images.arch,
archive: false
]

def armhf_builds = [
target: ["aerotenna_ocpoc_ubuntu"],
image: docker_images.armhf,
Expand All @@ -95,8 +87,7 @@ pipeline {
]

def nuttx_builds_other = [
target: ["atmel_same70xplained_default", "stm_32f4discovery_default", "px4_cannode-v1_default",
"px4_esc-v1_default", "stm_nucleo-F767ZI_default", "thiemar_s2740vc-v1_default"],
target: ["px4_cannode-v1_default", "px4_esc-v1_default", "thiemar_s2740vc-v1_default"],
image: docker_images.nuttx,
archive: false
]
Expand All @@ -114,7 +105,7 @@ pipeline {
]

def docker_builds = [
arch_builds, armhf_builds, base_builds, nuttx_builds_archive, nuttx_builds_other, rpi_builds, snapdragon_builds
armhf_builds, base_builds, nuttx_builds_archive, nuttx_builds_other, rpi_builds, snapdragon_builds
]

for (def build_type = 0; build_type < docker_builds.size(); build_type++) {
Expand All @@ -134,7 +125,7 @@ pipeline {
// TODO: actually upload artifacts to S3
stage('S3 Upload') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
options {
skipDefaultCheckout()
Expand Down Expand Up @@ -165,9 +156,16 @@ pipeline {

def createBuildNode(Boolean archive, String docker_image, String target) {
return {

// TODO: fix the snapdragon image
bypass_entrypoint = ''
if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2018-09-12') {
bypass_entrypoint = ' --entrypoint=""'
}

node {
docker.withRegistry('https://registry.hub.docker.com', 'docker_hub_dagar') {
docker.image(docker_image).inside('-e CCACHE_BASEDIR=${WORKSPACE} -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
docker.image(docker_image).inside('-e CCACHE_BASEDIR=${WORKSPACE} -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' + bypass_entrypoint) {
stage(target) {
try {
sh('export')
Expand Down
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile-hardware
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pipeline {
stage('px4_fmu-v4_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -34,7 +34,7 @@ pipeline {
stage('px4_fmu-v4_stackcheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ posix-configs/SITL/init/test/*_generated
/parameters.md
/parameters.xml
/modules
/msg/ros/*.msg

*.gcov
.coverage
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
[submodule "platforms/nuttx/NuttX/nuttx"]
path = platforms/nuttx/NuttX/nuttx
url = https://github.com/PX4/NuttX.git
branch = px4_firmware_nuttx-7.22+
branch = px4_firmware_nuttx-7.28+
[submodule "platforms/nuttx/NuttX/apps"]
path = platforms/nuttx/NuttX/apps
url = https://github.com/PX4/NuttX-apps.git
branch = px4_firmware_nuttx-7.22+
branch = px4_firmware_nuttx-7.28+
[submodule "cmake/configs/uavcan_board_ident"]
path = cmake/configs/uavcan_board_ident
url = https://github.com/PX4/uavcan_board_ident.git
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ set_property(GLOBAL PROPERTY PX4_MODULE_CONFIG_FILES)
include(platforms/${PX4_PLATFORM}/cmake/px4_impl_os.cmake)
list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake)

if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake/init.cmake")
include(init)
endif()

# CMake build type (Debug Release RelWithDebInfo MinSizeRel Coverage)
if (NOT CMAKE_BUILD_TYPE)
if (${PX4_PLATFORM} STREQUAL "nuttx")
Expand Down
102 changes: 64 additions & 38 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pipeline {
stage('Catkin build on ROS workspace') {
agent {
docker {
image 'px4io/px4-dev-ros:2019-01-01'
image 'px4io/px4-dev-ros:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -44,7 +44,7 @@ pipeline {
stage('Colcon build on ROS2 workspace') {
agent {
docker {
image 'px4io/px4-dev-ros2-bouncy:2019-01-01'
image 'px4io/px4-dev-ros2-bouncy:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -73,7 +73,7 @@ pipeline {

stage('Style check') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh 'make check_format'
Expand All @@ -88,7 +88,7 @@ pipeline {
stage('Bloaty px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -116,7 +116,7 @@ pipeline {
stage('Bloaty px4_fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -144,7 +144,7 @@ pipeline {
stage('Clang analyzer') {
agent {
docker {
image 'px4io/px4-dev-clang:2019-01-01'
image 'px4io/px4-dev-clang:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -178,31 +178,31 @@ pipeline {
}
}

stage('Clang tidy') {
agent {
docker {
image 'px4io/px4-dev-clang:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
retry (3) {
sh 'make distclean'
sh 'make clang-tidy-quiet'
}
}
post {
always {
sh 'make distclean'
}
}
}
// stage('Clang tidy') {
// agent {
// docker {
// image 'px4io/px4-dev-clang:2019-01-27'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// }
// }
// steps {
// sh 'export'
// retry (3) {
// sh 'make distclean'
// sh 'make clang-tidy-quiet'
// }
// }
// post {
// always {
// sh 'make distclean'
// }
// }
// }

stage('Cppcheck') {
agent {
docker {
image 'px4io/px4-dev-base:2019-01-01'
image 'px4io/px4-dev-base:2019-01-26'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -239,7 +239,7 @@ pipeline {
stage('Check stack') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -258,7 +258,7 @@ pipeline {
stage('ShellCheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -277,7 +277,7 @@ pipeline {
stage('Module config validation') {
agent {
docker {
image 'px4io/px4-dev-base:2019-01-01'
image 'px4io/px4-dev-base:2019-01-26'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -302,7 +302,7 @@ pipeline {

stage('Airframe') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh 'make distclean'
Expand All @@ -321,7 +321,7 @@ pipeline {

stage('Parameter') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh 'make distclean'
Expand All @@ -340,7 +340,7 @@ pipeline {

stage('Module') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh 'make distclean'
Expand All @@ -360,7 +360,7 @@ pipeline {
stage('uORB graphs') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -389,7 +389,7 @@ pipeline {

stage('Devguide') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh('export')
Expand Down Expand Up @@ -419,7 +419,7 @@ pipeline {

stage('Userguide') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh('export')
Expand Down Expand Up @@ -447,7 +447,7 @@ pipeline {

stage('QGroundControl') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh('export')
Expand All @@ -473,9 +473,35 @@ pipeline {
}
}

stage('PX4 ROS msgs') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-27' }
}
steps {
checkout(scm)
sh('export')
withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git -b ${BRANCH_NAME}")
sh('python msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
sh('cd px4_msgs; git push origin master || true')
sh('rm -rf px4_msgs')
}
}
when {
anyOf {
branch 'master'
branch 'pr-jenkins' // for testing
}
}
options {
skipDefaultCheckout()
}
}

stage('S3') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-26' }
}
steps {
sh('export')
Expand Down
Loading

0 comments on commit a14aa3b

Please sign in to comment.