Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jenkins: allow test to specify docker image with default #11294

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .ci/Jenkinsfile-SITL_tests
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pipeline {

agent {
docker {
image 'px4io/px4-dev-ros-kinetic:2018-09-11'
image 'px4io/px4-dev-ros-kinetic:2019-01-25'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE --cap-add SYS_PTRACE'
}
}
Expand Down Expand Up @@ -101,7 +101,8 @@ pipeline {
name: "MC_offboard_att",
test: "mavros_posix_tests_offboard_attctl.test",
mission: "",
vehicle: "iris"
vehicle: "iris",
docker_image: "px4io/px4-dev-ros-kinetic:2018-09-11" // TODO: Update image after https://github.com/mavlink/mavros/pull/1161
],
[
name: "MC_offboard_pos",
Expand Down Expand Up @@ -208,10 +209,11 @@ pipeline {
} // pipeline

def createTestNode(Map test_def) {
def docker_image = test_def.get('docker_image', 'px4io/px4-dev-ros-kinetic:2019-01-25')
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE') {
docker.image(docker_image).inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE') {
stage(test_def.name) {
def test_ok = true
sh('export')
Expand Down