From 3dae60dd1f4529b60c59bfee8efc98ff3079b5d9 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 2 Apr 2018 12:05:49 -0400 Subject: [PATCH 1/3] Jenkins split snapdragon build into linux + qurt --- Jenkinsfile | 61 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bab02cb9463e..8a80c1a402f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,9 +19,12 @@ pipeline { def docker_base = "px4io/px4-dev-base:2018-03-30" def docker_nuttx = "px4io/px4-dev-nuttx:2018-03-30" + def docker_ros = "px4io/px4-dev-ros:2018-03-30" def docker_rpi = "px4io/px4-dev-raspi:2018-03-30" def docker_armhf = "px4io/px4-dev-armhf:2017-12-30" def docker_arch = "px4io/px4-dev-base-archlinux:2018-03-30" + def docker_snapdragon = "lorenzmeier/px4-dev-snapdragon:2017-12-29" + def docker_clang = "px4io/px4-dev-clang:2018-03-30" // fmu-v2_{default, lpe} and fmu-v3_{default, rtps} // bloaty compare to last successful master build @@ -69,35 +72,18 @@ pipeline { builds[node_name] = createBuildNode(docker_nuttx, "${node_name}_default") } - builds["sitl"] = createBuildNode(docker_base, "posix_sitl_default") - builds["sitl_rtps"] = createBuildNode(docker_base, "posix_sitl_rtps") - builds["sitl (GCC 7)"] = createBuildNode(docker_arch, "posix_sitl_default") + builds["sitl"] = createBuildNode(docker_base, 'posix_sitl_default') + builds["sitl_rtps"] = createBuildNode(docker_base, 'posix_sitl_rtps') + builds["sitl (GCC 7)"] = createBuildNode(docker_arch, 'posix_sitl_default') - builds["rpi"] = createBuildNode(docker_rpi, "posix_rpi_cross") - builds["bebop"] = createBuildNode(docker_rpi, "posix_bebop_default") + builds["rpi"] = createBuildNode(docker_rpi, 'posix_rpi_cross') + builds["bebop"] = createBuildNode(docker_rpi, 'posix_bebop_default') - builds["ocpoc"] = createBuildNode(docker_armhf, "posix_ocpoc_ubuntu") + builds["ocpoc"] = createBuildNode(docker_armhf, 'posix_ocpoc_ubuntu') - // snapdragon eagle (posix + qurt) - builds["eagle"] = { - node { - stage("Build Test eagle_default") { - docker.withRegistry('https://registry.hub.docker.com', 'docker_hub_dagar') { - docker.image("lorenzmeier/px4-dev-snapdragon:2017-12-29").inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { - stage("eagle_default") { - checkout scm - sh "export" - sh "make distclean" - sh "ccache -z" - sh "make eagle_default" - sh "ccache -s" - sh "make distclean" - } - } - } - } - } - } + // snapdragon (eagle_default) + builds["eagle (linux)"] = createBuildNodeDockerLogin(docker_snapdragon, 'docker_hub_dagar', 'posix_eagle_default') + builds["eagle (qurt)"] = createBuildNodeDockerLogin(docker_snapdragon, 'docker_hub_dagar', 'qurt_eagle_default') parallel builds } // script @@ -529,3 +515,26 @@ def createBuildNode(String docker_repo, String target) { } } } + +def createBuildNodeDockerLogin(String docker_repo, String docker_credentials, String target) { + return { + node { + docker.withRegistry('https://registry.hub.docker.com', docker_credentials) { + docker.image(docker_repo).inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { + stage(target) { + sh('export') + checkout scm + sh('make distclean') + sh('git fetch --tags') + sh('ccache -z') + sh('make ' + target) + sh('ccache -s') + sh('make sizes') + archiveArtifacts(allowEmptyArchive: true, artifacts: 'build/**/*.px4, build/**/*.elf', fingerprint: true, onlyIfSuccessful: true) + sh('make distclean') + } + } + } + } + } +} From 68200c5e20ddad4da7ffd2d29a2c5d3223dcb87f Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 2 Apr 2018 12:21:15 -0400 Subject: [PATCH 2/3] Jenkins bloaty comparison show top 100 (default is 10) --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a80c1a402f8..e338b4e8bba6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,14 +41,14 @@ pipeline { sh "make px4io-v2_default" sh "make nuttx_px4fmu-v2_default" // bloaty output and compare with last successful master - sh "bloaty -n 100 -d symbols -s file build/nuttx_px4fmu-v2_default/nuttx_px4fmu-v2_default.elf" - sh "bloaty -n 100 -d compileunits -s file build/nuttx_px4fmu-v2_default/nuttx_px4fmu-v2_default.elf" + sh "bloaty -d symbols -n 100 -s file build/nuttx_px4fmu-v2_default/nuttx_px4fmu-v2_default.elf" + sh "bloaty -d compileunits -n 100 -s file build/nuttx_px4fmu-v2_default/nuttx_px4fmu-v2_default.elf" sh "wget --no-verbose -N https://s3.amazonaws.com/px4-travis/Firmware/master/nuttx_px4fmu-v2_default.elf" - sh "bloaty -d symbols -C full -s file build/nuttx_px4fmu-v2_default/nuttx_px4fmu-v2_default.elf -- nuttx_px4fmu-v2_default.elf" + sh "bloaty -d symbols -n 100 -C full -s file build/nuttx_px4fmu-v2_default/nuttx_px4fmu-v2_default.elf -- nuttx_px4fmu-v2_default.elf" sh "make nuttx_px4fmu-v2_lpe" sh "make nuttx_px4fmu-v3_default" sh "wget --no-verbose -N https://s3.amazonaws.com/px4-travis/Firmware/master/nuttx_px4fmu-v3_default.elf" - sh "bloaty -d symbols -C full -s file build/nuttx_px4fmu-v3_default/nuttx_px4fmu-v3_default.elf -- nuttx_px4fmu-v3_default.elf" + sh "bloaty -d symbols -n 100 -C full -s file build/nuttx_px4fmu-v3_default/nuttx_px4fmu-v3_default.elf -- nuttx_px4fmu-v3_default.elf" sh "make nuttx_px4fmu-v3_rtps" sh "make sizes" sh "ccache -s" From 28dc168a2177e22b2e866eb306baeb4527599d14 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 2 Apr 2018 13:18:18 -0400 Subject: [PATCH 3/3] gitmodules make urls consistent --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 86877d0b8a04..15d926da0d07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,7 +36,7 @@ branch = master [submodule "cmake/cmake_hexagon"] path = cmake/cmake_hexagon - url = https://github.com/ATLFlight/cmake_hexagon + url = https://github.com/ATLFlight/cmake_hexagon.git branch = master [submodule "src/drivers/gps/devices"] path = src/drivers/gps/devices