Skip to content
Merged
Show file tree
Hide file tree
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
24 changes: 21 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ if (BRANCH_NAME == "stable") {

pipeline {
agent any

options {
skipDefaultCheckout()
timeout(time: 1, unit: 'HOURS')
Expand Down Expand Up @@ -94,9 +95,9 @@ pipeline {
}

stage("${OS} Bootstrap") {
sh "GIT_BRANCH=${BRANCH_NAME} ./deploy/build.sh --os=bootstrap"
sh "GIT_BRANCH=\$BRANCH_NAME ./deploy/build.sh --os=bootstrap"

if (env.OS.endsWith("armhf")) {
if (OS.endsWith("armhf")) {
sh "docker run --rm --privileged multiarch/qemu-user-static:register --reset"
}
}
Expand All @@ -105,6 +106,23 @@ pipeline {
network="jenkins-${EXECUTOR_NUMBER}-${OS}"
sh "./deploy/build.sh --os=${OS} --test --dockernetwork=${network}"
}

// The IDL/MATLAB tests need to be run the same OS as the build server
if (OS == "ubuntu22") {
stage("IDL") {
env.MDSPLUS_DIR = "${WORKSPACE}/tests/64/buildroot"
sh """
set +x
. \$MDSPLUS_DIR/setup.sh
set -x
./idl/testing/run_tests.py
"""
}

stage("MATLAB") {
// TODO
}
}
}
}
])
Expand All @@ -118,7 +136,7 @@ pipeline {
for (OS in OSList) {
ws("${WORKSPACE}/${OS}") {
sh "./deploy/tap-to-junit.py --junit-suite-name=${OS}"
junit skipPublishingChecks: true, testResults: 'mdsplus-junit.xml'
junit skipPublishingChecks: true, testResults: 'mdsplus-junit.xml', keepLongStdio: true
}
}
}
Expand Down
Loading