From 634a48f157fb0c0dce80991aafd397fee340f40b Mon Sep 17 00:00:00 2001 From: Jann-Niklas Zimmermann Date: Tue, 7 Jan 2025 13:45:30 +0100 Subject: [PATCH] runfix: Wait until smoke tests are done --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c17ab7f5b22..7466720d3fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 } } @@ -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")] } } } @@ -170,4 +170,4 @@ pipeline { } } } -} \ No newline at end of file +}