Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 11:06:04 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Jenkins move raspi and bebop builds to regular armhf toolchain

Browse Source
This commit is contained in:
Daniel Agar
2019-11-05 15:27:35 -05:00
parent 5ec74af421
commit d263811eef
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/Jenkinsfile-compile
+2 -9
View File
@@ -12,12 +12,11 @@ pipeline {
armhf: "px4io/px4-dev-armhf:2019-10-24", armhf: "px4io/px4-dev-armhf:2019-10-24",
base: "px4io/px4-dev-base-bionic:2019-10-24", base: "px4io/px4-dev-base-bionic:2019-10-24",
nuttx: "px4io/px4-dev-nuttx:2019-10-24", nuttx: "px4io/px4-dev-nuttx:2019-10-24",
rpi: "px4io/px4-dev-raspi:2019-10-24",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
] ]
def armhf_builds = [ def armhf_builds = [
target: ["aerotenna_ocpoc_ubuntu"], target: ["aerotenna_ocpoc_ubuntu", "emlid_navio2_cross", "parrot_bebop_default"],
image: docker_images.armhf, image: docker_images.armhf,
archive: false archive: false
] ]
@@ -49,12 +48,6 @@ pipeline {
archive: false archive: false
] ]
def rpi_builds = [
target: ["emlid_navio2_cross", "parrot_bebop_default"],
image: docker_images.rpi,
archive: false
]
def snapdragon_builds = [ def snapdragon_builds = [
target: ["atlflight_eagle_qurt-default", "atlflight_eagle_default"], target: ["atlflight_eagle_qurt-default", "atlflight_eagle_default"],
image: docker_images.snapdragon, image: docker_images.snapdragon,
@@ -62,7 +55,7 @@ pipeline {
] ]
def docker_builds = [ def docker_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, snapdragon_builds
] ]
for (def build_type = 0; build_type < docker_builds.size(); build_type++) { for (def build_type = 0; build_type < docker_builds.size(); build_type++) {
Tools/docker_run.sh
+2 -5
View File
@@ -5,14 +5,11 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
if [[ $@ =~ .*px4_fmu.* ]]; then if [[ $@ =~ .*px4_fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5} # nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-10-24" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-10-24"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-10-24"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior # eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12" PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12"
elif [[ $@ =~ .*ocpoc.* ]]; then elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# aerotennaocpoc_ubuntu # aerotennaocpoc_ubuntu, posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-10-24" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-10-24"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools # clang tools