Skip to content

Commit 5f6c824

Browse files
authored
Merge pull request #3662 from The-OpenROAD-Project-staging/ci-upload-metrics-fix
CI: Ensures builds with failed tests proceed to cleanup and reporting
2 parents f927241 + d2220c9 commit 5f6c824

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

jenkins/public_nightly.Jenkinsfile

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,22 @@ node {
5555
buildBins(DOCKER_IMAGE, '--local --no_init --latest');
5656
}
5757

58-
stage('Run Tests') {
59-
if (env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('ci-dev')) {
60-
runTests(DOCKER_IMAGE, 'dev');
61-
} else {
62-
runTests(DOCKER_IMAGE, 'nightly');
58+
try {
59+
stage('Run Tests') {
60+
if (env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('ci-dev')) {
61+
runTests(DOCKER_IMAGE, 'dev');
62+
} else {
63+
runTests(DOCKER_IMAGE, 'nightly');
64+
}
65+
}
66+
} catch (e) {
67+
throw e
68+
} finally {
69+
stage ('Cleanup and Reporting') {
70+
env.CHANGE_BRANCH = 'nightly'
71+
env.BRANCH_NAME = 'nightly'
72+
finalReport(DOCKER_IMAGE);
6373
}
64-
}
65-
66-
stage ('Cleanup and Reporting') {
67-
env.CHANGE_BRANCH = 'nightly'
68-
env.BRANCH_NAME = 'nightly'
69-
finalReport(DOCKER_IMAGE);
7074
}
7175

7276
}

jenkins/public_tests_all.Jenkinsfile

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,20 @@ node {
5252
buildBins(DOCKER_IMAGE);
5353
}
5454

55-
stage('Run Tests') {
56-
if (env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('ci-dev')) {
57-
runTests(DOCKER_IMAGE, 'dev');
58-
} else {
59-
runTests(DOCKER_IMAGE, 'pr');
55+
try {
56+
stage('Run Tests') {
57+
if (env.CHANGE_BRANCH && env.CHANGE_BRANCH.contains('ci-dev')) {
58+
runTests(DOCKER_IMAGE, 'dev');
59+
} else {
60+
runTests(DOCKER_IMAGE, 'pr');
61+
}
62+
}
63+
} catch (e) {
64+
throw e
65+
} finally {
66+
stage ('Cleanup and Reporting') {
67+
finalReport(DOCKER_IMAGE);
6068
}
61-
}
62-
63-
stage ('Cleanup and Reporting') {
64-
finalReport(DOCKER_IMAGE);
6569
}
6670

6771
}

0 commit comments

Comments
 (0)