File tree Expand file tree Collapse file tree 3 files changed +22
-28
lines changed Expand file tree Collapse file tree 3 files changed +22
-28
lines changed Original file line number Diff line number Diff line change @@ -220,17 +220,24 @@ node {
220
220
build_docker_images[" Test Installer - ${ os.name} " ] = {
221
221
node {
222
222
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/**' ;
226
234
}
227
235
}
228
236
}
229
237
parallel(build_docker_images);
230
238
DOCKER_IMAGE = dockerPush(' ubuntu22.04' , ' openroad' );
231
239
echo " Docker image is ${ DOCKER_IMAGE} " ;
232
240
}
233
- parallel(getParallelTests(DOCKER_IMAGE ));
234
241
stage(' Send Email Report' ) {
235
242
sendEmail();
236
243
}
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
- set -eo pipefail
4
-
3
+ set +x
5
4
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
Original file line number Diff line number Diff line change @@ -142,7 +142,8 @@ _test() {
142
142
echo " Could not find ${imagePath} , will attempt to create it" >&2
143
143
_create
144
144
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} "
146
147
}
147
148
148
149
_checkFromImage () {
You can’t perform that action at this time.
0 commit comments