Merge pull request #4288 from locriandev/ocp4-scan-konflux

ocp4-scan: ignore lock on dry run mode
openshift-eng · Nov 15, 2024 · 73b881a · 73b881a
2 parents 9bbc226 + 329384a
commit 73b881a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/jobs/build/ocp4-scan-konflux/Jenkinsfile b/jobs/build/ocp4-scan-konflux/Jenkinsfile
@@ -45,12 +45,12 @@ timeout(activity: true, time: 60, unit: 'MINUTES') {
                         defaultValue: "",
                         trim: true,
                     ),
-                        booleanParam(
-                            name: 'DRY_RUN',
-                            description: 'Run scan without triggering subsequent jobs',
-                            defaultValue: false,
-                        ),
-                        commonlib.mockParam(),
+                    booleanParam(
+                        name: 'DRY_RUN',
+                        description: 'Run scan without triggering subsequent jobs',
+                        defaultValue: false,
+                    ),
+                    commonlib.mockParam(),
                     ]
                 ],
                 disableResume()

diff --git a/jobs/build/ocp4_scan/Jenkinsfile b/jobs/build/ocp4_scan/Jenkinsfile
@@ -37,11 +37,6 @@ timeout(activity: true, time: 60, unit: 'MINUTES') {
                         commonlib.artToolsParam(),
                         commonlib.ocpVersionParam('VERSION', '4'),
                         commonlib.suppressEmailParam(),
-                        booleanParam(
-                            name: 'IGNORE_LOCKS',
-                            description: 'Do not wait for other builds in this version to complete (allowed only if DRY_RUN is true)',
-                            defaultValue: false
-                        ),
                         string(
                             name: 'MAIL_LIST_SUCCESS',
                             description: 'Success Mailing List',
@@ -79,10 +74,6 @@ timeout(activity: true, time: 60, unit: 'MINUTES') {
 
             if (params.DRY_RUN) {
                 currentBuild.displayName += "[DRY_RUN]"
-            } else {
-                if (params.IGNORE_LOCKS) {
-                    error("IGNORE_LOCKS can be used only with dry run mode")
-                }
             }
 
             buildlib.cleanWorkdir(artcd_working, true)
@@ -104,9 +95,6 @@ timeout(activity: true, time: 60, unit: 'MINUTES') {
                     "ocp4-scan",
                     "--version=${params.VERSION}"
                 ]
-                if (params.IGNORE_LOCKS) {
-                    cmd << "--ignore-locks"
-                }
 
                 // Run pipeline
                 buildlib.withAppCiAsArtPublish() {