Skip to content

Commit

Permalink
Merge pull request #18563 from wireapp/fix/wait-for-smoke
Browse files Browse the repository at this point in the history
runfix(pipeline): Let pre-commit pipeline wait until smoke tests are done
  • Loading branch information
corodiak authored Jan 7, 2025
2 parents 7b87872 + 634a48f commit 5c3a308
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ pipeline {
final List workflowRuns = jsonData['workflow_runs']
echo("Looking for hash ${commit_hash}")

return workflowRuns.any { run ->
return workflowRuns.any { run ->
def result = checkWorkflowRun(run, commit_hash)
if (run['conclusion'] == 'cancelled') {
echo("GitHub Action was cancelled. Ending Jenkins pipeline.")
return true
}

return result
}
}
Expand Down Expand Up @@ -155,7 +155,7 @@ pipeline {

stage('Trigger smoke test') {
steps {
build job: 'Webapp_Smoke_Chrome', parameters: [string(name: 'TAGS', value: '@smoke'), string(name: 'GIT_BRANCH', value: 'web-dev'), string(name: 'webappApplicationPath', value: "$webappApplicationPath")], wait: false
build job: 'Webapp_Smoke_Chrome', parameters: [string(name: 'TAGS', value: '@smoke'), string(name: 'GIT_BRANCH', value: 'web-dev'), string(name: 'webappApplicationPath', value: "$webappApplicationPath")]
}
}
}
Expand All @@ -170,4 +170,4 @@ pipeline {
}
}
}
}
}

0 comments on commit 5c3a308

Please sign in to comment.