CLOUD-695_jenkinsfile_improvements add finally to log push
@@ -66,9 +66,12 @@ testsReportMap = [:]
testsResultsMap = [:]
void makeReport() {
+ def wholeTestAmount=sh(script: 'cat e2e-tests/run | grep "|| fail"| wc -l', , returnStdout: true).trim()
+ def startedTestAmount = testsReportMap.size()
for ( test in testsReportMap ) {
TestsReport = TestsReport + "\r\n| ${test.key} | ${test.value} |"
}
+ TestsReport = TestsReport + "\r\n| We run $startedTestAmount out of $wholeTestAmount|"
}
void setTestsresults() {
@@ -109,10 +112,12 @@ void runTest(String TEST_NAME, String CLUSTER_PREFIX) {
retryCount++
return false
}
- }
+ finally {
pushLogFile(TEST_NAME)
echo "The $TEST_NAME test was finished!"
}
+ }
+}
void installRpms() {
sh '''
@@ -122,9 +127,9 @@ void installRpms() {
'''
}
-def skipBranchBulds = true
+def skipBranchBuilds = true
if ( env.CHANGE_URL ) {
- skipBranchBulds = false
+ skipBranchBuilds = false
}
pipeline {
@@ -145,7 +150,7 @@ pipeline {
stage('Prepare') {
when {
expression {
- !skipBranchBulds
+ !skipBranchBuilds
}
}
steps {
@@ -193,7 +198,7 @@ pipeline {
stage('Build docker image') {
when {
expression {
- !skipBranchBulds
+ !skipBranchBuilds
}
}
steps {
@@ -220,7 +225,7 @@ pipeline {
stage('GoLicenseDetector test') {
when {
expression {
- !skipBranchBulds
+ !skipBranchBuilds
}
}
steps {
@@ -247,7 +252,7 @@ pipeline {
stage('GoLicense test') {
when {
expression {
- !skipBranchBulds
+ !skipBranchBuilds
}
}
steps {
@@ -281,7 +286,7 @@ pipeline {
stage('Run tests for operator') {
when {
expression {
- !skipBranchBulds
+ !skipBranchBuilds
}
}
options {
