zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Jenkins CI: move SITL tests to Melodic container

sbg
TSC21 5 years ago committed by Nuno Marques
parent
a7727769e9
commit
6fbc8afd50
3 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .ci/Jenkinsfile-SITL_tests
  2. 4
      .ci/Jenkinsfile-SITL_tests_ASan
  3. 2
      .ci/Jenkinsfile-SITL_tests_coverage

4
.ci/Jenkinsfile-SITL_tests
Unescape View File

@ -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

4
.ci/Jenkinsfile-SITL_tests_ASan
Unescape View File

@ -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

2
.ci/Jenkinsfile-SITL_tests_coverage
Unescape View File

@ -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')

Write Preview
Loading…
Cancel
Save