From c26ff5150c994e15300c4c017a354b52ac783027 Mon Sep 17 00:00:00 2001
From: Ashwin Das <ashwindasr@gmail.com>
Date: Thu, 20 Aug 2026 11:40:14 -0400
Subject: [PATCH] Revert "feat(layered-products): trigger build on artc cluster
 via --on-cluster"

---
 jobs/build/layered-products/Jenkinsfile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/jobs/build/layered-products/Jenkinsfile b/jobs/build/layered-products/Jenkinsfile
index 55532abdc6..6a8f81346d 100644
--- a/jobs/build/layered-products/Jenkinsfile
+++ b/jobs/build/layered-products/Jenkinsfile
@@ -81,11 +81,6 @@ node {
                         description: '(For testing) Skip the rebase step',
                         defaultValue: false
                     ),
-                    booleanParam(
-                        name: 'ON_CLUSTER',
-                        description: 'Trigger the build on the artc cluster (Tekton). Disable to run locally (e.g. when testing a PR)',
-                        defaultValue: false
-                    ),
                     choice(
                         name: 'NETWORK_MODE',
                         description: 'Override network mode for Konflux builds',
@@ -158,10 +153,6 @@ node {
                 cmd += ["--image-list=${commonlib.cleanCommaList(params.IMAGE_LIST)}"]
             }
 
-            if (params.ON_CLUSTER) {
-                cmd << "--on-cluster"
-            }
-
             // Needed to detect manual builds
                 wrap([$class: 'BuildUser']) {
                         builderEmail = env.BUILD_USER_EMAIL
@@ -171,7 +162,6 @@ node {
                 withCredentials([
                             string(credentialsId: 'jenkins-service-account', variable: 'JENKINS_SERVICE_ACCOUNT'),
                             string(credentialsId: 'jenkins-service-account-token', variable: 'JENKINS_SERVICE_ACCOUNT_TOKEN'),
-                            file(credentialsId: 'art-cluster-lp-pipeline-kubeconfig', variable: 'ART_CLUSTER_LP_KUBECONFIG'),
                             file(credentialsId: 'konflux-bot-0-art-oadp-tenant-sa', variable: 'OADP_KONFLUX_SA_KUBECONFIG'),
                             file(credentialsId: 'konflux-bot-0-art-mta-tenant-sa', variable: 'MTA_KONFLUX_SA_KUBECONFIG'),
                             file(credentialsId: 'konflux-bot-0-art-mtc-tenant-sa', variable: 'MTC_KONFLUX_SA_KUBECONFIG'),
@@ -200,7 +190,7 @@ node {
                     withEnv(envVars) {
                         buildlib.init_artcd_working_dir()
                         try {
-                            sh(script: cmd.join(' '))
+                            sh(script: cmd.join(' '), returnStdout: true)
                         } catch (err) {
                             // If any image build/push failures occurred, mark the job run as unstable
                             currentBuild.result = "UNSTABLE"