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

Jenkins: bypass entrypoint temporarily (#11329)

Browse Source 
* Jenkins: no SITL entrypoint for now
* Jenkins: complile - no snapdragon eagle entrypoint for now
This commit is contained in:
Anthony Lamping
2019-01-29 09:48:24 -05:00
committed by Daniel Agar
parent cdb6aca6bd
commit 22fe083666
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/Jenkinsfile-SITL_tests
+2 -2
View File
@@ -18,7 +18,7 @@ pipeline {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-kinetic:2018-09-11' 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=""'
} }
} }
@@ -211,7 +211,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() 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) { stage(test_def.name) {
def test_ok = true def test_ok = true
sh('export') sh('export')
.ci/Jenkinsfile-compile
+8 -1
View File
@@ -156,9 +156,16 @@ pipeline {
def createBuildNode(Boolean archive, String docker_image, String target) { def createBuildNode(Boolean archive, String docker_image, String target) {
return { return {
// TODO: fix the snapdragon image
bypass_entrypoint = ''
if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2018-09-12') {
bypass_entrypoint = ' --entrypoint=""'
}
node { node {
docker.withRegistry('https://registry.hub.docker.com', 'docker_hub_dagar') { 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) { stage(target) {
try { try {
sh('export') sh('export')