From fc9a0e459ed357b4c90b0f88559a295d94857d0f Mon Sep 17 00:00:00 2001 From: Karsten Jeppesen Date: Tue, 1 Sep 2026 12:33:27 +0200 Subject: [PATCH] WIP --- .workflow/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.workflow/Jenkinsfile b/.workflow/Jenkinsfile index 07963c0..3b81f4c 100644 --- a/.workflow/Jenkinsfile +++ b/.workflow/Jenkinsfile @@ -86,7 +86,7 @@ pipeline { } stage('Scan with Ollama') { - when { branch 'Security' && expression { fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } + when { expression { branch 'Security' && fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } steps { sh ".workflow/scan_with_ollama.sh \"$TEXT_FILES_FILE\" \"$SCAN_JSON_FILE\" \"$OLLAMA_MODEL\" \"$MAX_FILE_BYTES\" \"$REQUEST_TIMEOUT_SEC\"" archiveArtifacts artifacts: "$SCAN_JSON_FILE", allowEmptyArchive: true @@ -94,7 +94,7 @@ pipeline { } stage('Build Markdown Report') { - when { branch 'Security' && expression { fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } + when { expression { branch 'Security' && fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } steps { sh ".workflow/build_markdown_report.sh \"$SCAN_JSON_FILE\" \"$REPORT_FILE\"" archiveArtifacts artifacts: "$REPORT_FILE", allowEmptyArchive: true @@ -102,14 +102,14 @@ pipeline { } stage('Report to Gitea (Issue)') { - when { branch 'Security' && expression { fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } + when { expression { branch 'Security' && fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } steps { sh ".workflow/create_gitea_issue.sh \"$REPORT_FILE\"" } } stage('Quality Gate') { - when { branch 'Security' && expression { fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } + when { expression { branch 'Security' && fileExists('text_files.txt') && sh(script: "test -s text_files.txt", returnStatus: true) == 0 } } steps { sh ".workflow/evaluate_threshold.sh \"$SCAN_JSON_FILE\" \"$FAIL_ON_MEDIUM_OR_HIGH\"" }