NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-01-11) (#7014)

* ENT-6494: Upgraded log4j to 2.17.0 (#6996)

* NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-01-07) (#7007)

* backported from emergency releases for log4j updates
* adds a build parameter, which control if tests should be run or not, default is `true`

* ENT-6494: Upgraded log4j to 2.17.1

Co-authored-by: Adel El-Beik <48713346+adelel1@users.noreply.github.com>
Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
This commit is contained in:
Waldemar Żurowski 2022-01-11 12:44:42 +01:00 committed by GitHub
parent cf0b5b9cb1
commit 5de343ecf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -65,6 +65,7 @@ pipeline {
parameters {
choice choices: nexusIqStageChoices, description: 'NexusIQ stage for code evaluation', name: 'nexusIqStage'
booleanParam defaultValue: true, description: 'Run tests during this build?', name: 'DO_TEST'
}
/*
@ -91,6 +92,9 @@ pipeline {
}
stage('Stash') {
when {
expression { params.DO_TEST }
}
steps {
stash name: 'compiled', useDefaultExcludes: false
}
@ -115,6 +119,10 @@ pipeline {
}
stage('All Tests') {
when {
expression { params.DO_TEST }
beforeAgent true
}
parallel {
stage('Another agent') {
agent {
@ -297,10 +305,12 @@ pipeline {
always {
script {
try {
unstash 'allure-input'
allure includeProperties: false,
jdk: '',
results: [[path: '**/allure-input']]
if (params.DO_TEST) {
unstash 'allure-input'
allure includeProperties: false,
jdk: '',
results: [[path: '**/allure-input']]
}
} catch (err) {
echo("Allure report generation failed: $err")