diff --git a/Jenkinsfile b/Jenkinsfile index 02dd8516f..5962958a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,31 +64,10 @@ 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 5 - 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' - } - } - } + sleep 120 + def qualityGate = waitForQualityGate() + if (qualityGate.status != 'OK') { + currentBuild.result = 'FAIL' } if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { error('Quality gate failure: ${qualityGate.status}.');