enh(chore): remove CI's timeout workaround (#2945)
This commit is contained in:
parent
3dbfcab903
commit
12a49a2ea6
|
@ -1,5 +1,3 @@
|
||||||
import groovy.json.JsonSlurper
|
|
||||||
|
|
||||||
properties([buildDiscarder(logRotator(numToKeepStr: '50'))])
|
properties([buildDiscarder(logRotator(numToKeepStr: '50'))])
|
||||||
|
|
||||||
stage('Source') {
|
stage('Source') {
|
||||||
|
@ -20,33 +18,12 @@ stage('Source') {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// sonarQube step to get qualityGate result
|
||||||
stage('Quality gate') {
|
stage('Quality gate') {
|
||||||
node {
|
node {
|
||||||
def reportFilePath = "target/sonar/report-task.txt"
|
def qualityGate = waitForQualityGate()
|
||||||
def reportTaskFileExists = fileExists "${reportFilePath}"
|
if (qualityGate.status != 'OK') {
|
||||||
if (reportTaskFileExists) {
|
currentBuild.result = 'FAIL'
|
||||||
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'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
|
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
|
||||||
error("Quality gate failure: ${qualityGate.status}.");
|
error("Quality gate failure: ${qualityGate.status}.");
|
||||||
|
|
Loading…
Reference in New Issue