Skip to content

Commit 4a07c7f

Browse files
author
Vitor Bandeira
committed
test
Signed-off-by: Vitor Bandeira <[email protected]>
1 parent 10b17e1 commit 4a07c7f

File tree

3 files changed

+22
-28
lines changed

3 files changed

+22
-28
lines changed

Jenkinsfile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,17 +220,24 @@ node {
220220
build_docker_images["Test Installer - ${os.name}"] = {
221221
node {
222222
checkout scm;
223-
sh label: 'Build Docker image', script: "./etc/DockerHelper.sh create -target=builder -os=${os.image}";
224-
sh label: 'Test Docker image', script: "./etc/DockerHelper.sh test -target=builder -os=${os.image}";
225-
dockerPush("${os.image}", 'openroad');
223+
try {
224+
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
225+
sh label: 'Build Docker image', script: "./etc/DockerHelper.sh create -target=builder -os=${os.image}";
226+
sh label: 'Test Docker image', script: "./etc/DockerHelper.sh test -target=builder -os=${os.image}";
227+
dockerPush("${os.image}", 'openroad');
228+
}
229+
} catch (e) {
230+
echo 'Failed regressions';
231+
currentBuild.result = 'FAILURE';
232+
}
233+
archiveArtifacts artifacts: 'persistent/**';
226234
}
227235
}
228236
}
229237
parallel(build_docker_images);
230238
DOCKER_IMAGE = dockerPush('ubuntu22.04', 'openroad');
231239
echo "Docker image is ${DOCKER_IMAGE}";
232240
}
233-
parallel(getParallelTests(DOCKER_IMAGE));
234241
stage('Send Email Report') {
235242
sendEmail();
236243
}

docker/test_wrapper.sh

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
11
#!/usr/bin/env bash
22

3-
set -eo pipefail
4-
3+
set +x
54
cd "$(dirname $(readlink -f $0))/../"
6-
7-
if [[ -f "/opt/rh/rh-python38/enable" ]]; then
8-
source /opt/rh/rh-python38/enable
9-
fi
10-
11-
compiler=${1:-gcc}
12-
if [[ "${compiler}" == "gcc" ]]; then
13-
if [[ -f "/opt/rh/devtoolset-8/enable" ]]; then
14-
source /opt/rh/devtoolset-8/enable
15-
fi
16-
shift 1
17-
fi
18-
19-
if [[ "${compiler}" == "clang" ]]; then
20-
if [[ -f "/opt/rh/llvm-toolset-7.0/enable" ]]; then
21-
source /opt/rh/llvm-toolset-7.0/enable
22-
fi
23-
shift 1
24-
fi
25-
26-
eval "${@}"
5+
set +e
6+
eval "$1"
7+
ret=$?
8+
mkdir -p "$2"
9+
mv build "$2"/build
10+
mv src "$2"/src
11+
set -e
12+
exit $ret

etc/DockerHelper.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ _test() {
142142
echo "Could not find ${imagePath}, will attempt to create it" >&2
143143
_create
144144
fi
145-
docker run --rm "${imagePath}" "./docker/test_wrapper.sh" "${compiler}" "ctest --test-dir build -j ${numThreads}"
145+
mkdir -p persistent
146+
docker run --rm -v $(pwd)/persistent:/mnt "${imagePath}" "./docker/test_wrapper.sh" "${compiler}" "ctest --test-dir build -j ${numThreads}" "/mnt/${os}-${target}"
146147
}
147148

148149
_checkFromImage() {

0 commit comments

Comments
 (0)