enh(chore): remove CI's timeout workaround (#2945)

This commit is contained in:
sc979 2021-07-06 17:23:42 +02:00 committed by GitHub
parent 3dbfcab903
commit 12a49a2ea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 27 deletions

31
Jenkinsfile vendored
View File

@ -1,5 +1,3 @@
import groovy.json.JsonSlurper
properties([buildDiscarder(logRotator(numToKeepStr: '50'))])
stage('Source') {
@ -20,33 +18,12 @@ stage('Source') {
}
try {
// sonarQube step to get qualityGate result
stage('Quality gate') {
node {
def reportFilePath = "target/sonar/report-task.txt"
def reportTaskFileExists = fileExists "${reportFilePath}"
if (reportTaskFileExists) {
echo "Found report task file"
def taskProps = readProperties file: "${reportFilePath}"
echo "taskId[${taskProps['ceTaskId']}]"
timeout(time: 10, unit: 'MINUTES') {
while (true) {
sleep 10
def taskStatusResult =
sh(returnStdout: true, script: "curl -s -X GET -u ${authString} \'${sonarProps['sonar.host.url']}/api/ce/task?id=${taskProps['ceTaskId']}\'")
echo "taskStatusResult[${taskStatusResult}]"
def taskStatus = new JsonSlurper().parseText(taskStatusResult).task.status
echo "taskStatus[${taskStatus}]"
// Status can be SUCCESS, ERROR, PENDING, or IN_PROGRESS. The last two indicate it's
// not done yet.
if (taskStatus != "IN_PROGRESS" && taskStatus != "PENDING") {
break;
}
def qualityGate = waitForQualityGate()
if (qualityGate.status != 'OK') {
currentBuild.result = 'FAIL'
}
}
}
def qualityGate = waitForQualityGate()
if (qualityGate.status != 'OK') {
currentBuild.result = 'FAIL'
}
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error("Quality gate failure: ${qualityGate.status}.");