forked from Archive/PX4-Autopilot
Jenkins CI: move SITL tests to Melodic container
This commit is contained in:
parent
6cab14fc5d
commit
a0367b30b8
|
@ -8,7 +8,7 @@ pipeline {
|
||||||
stage('Build') {
|
stage('Build') {
|
||||||
agent {
|
agent {
|
||||||
docker {
|
docker {
|
||||||
image 'px4io/px4-dev-ros-kinetic:2019-10-04'
|
image 'px4io/px4-dev-ros-melodic:2019-10-04'
|
||||||
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
|
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -130,7 +130,7 @@ def createTestNode(Map test_def) {
|
||||||
return {
|
return {
|
||||||
node {
|
node {
|
||||||
cleanWs()
|
cleanWs()
|
||||||
docker.image("px4io/px4-dev-ros-kinetic:2019-10-04").inside('-e HOME=${WORKSPACE}') {
|
docker.image("px4io/px4-dev-ros-melodic:2019-10-04").inside('-e HOME=${WORKSPACE}') {
|
||||||
stage(test_def.name) {
|
stage(test_def.name) {
|
||||||
def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
|
def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
|
||||||
def test_ok = true
|
def test_ok = true
|
||||||
|
|
|
@ -8,7 +8,7 @@ pipeline {
|
||||||
stage('Build') {
|
stage('Build') {
|
||||||
agent {
|
agent {
|
||||||
docker {
|
docker {
|
||||||
image 'px4io/px4-dev-ros-kinetic:2019-10-04'
|
image 'px4io/px4-dev-ros-melodic:2019-10-04'
|
||||||
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
|
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -131,7 +131,7 @@ def createTestNode(Map test_def) {
|
||||||
return {
|
return {
|
||||||
node {
|
node {
|
||||||
cleanWs()
|
cleanWs()
|
||||||
docker.image("px4io/px4-dev-ros-kinetic:2019-10-04").inside('-e HOME=${WORKSPACE}') {
|
docker.image("px4io/px4-dev-ros-melodic:2019-10-04").inside('-e HOME=${WORKSPACE}') {
|
||||||
stage(test_def.name) {
|
stage(test_def.name) {
|
||||||
def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
|
def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
|
||||||
def test_ok = true
|
def test_ok = true
|
||||||
|
|
|
@ -137,7 +137,7 @@ def createTestNode(Map test_def) {
|
||||||
return {
|
return {
|
||||||
node {
|
node {
|
||||||
cleanWs()
|
cleanWs()
|
||||||
docker.image("px4io/px4-dev-ros-kinetic:2019-10-04").inside('-e HOME=${WORKSPACE}') {
|
docker.image("px4io/px4-dev-ros-melodic:2019-10-04").inside('-e HOME=${WORKSPACE}') {
|
||||||
stage(test_def.name) {
|
stage(test_def.name) {
|
||||||
def test_ok = true
|
def test_ok = true
|
||||||
sh('export')
|
sh('export')
|
||||||
|
|
Loading…
Reference in New Issue