Skip to content

Revert "feat(layered-products): trigger build on artc cluster via --on-cluster" #4796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashwindasr merged 1 commit into from
Aug 20, 2026
+1 −11
Merged

Revert "feat(layered-products): trigger build on artc cluster via --on-cluster" #4796

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions jobs/build/layered-products/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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
Expand All @@ -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'),
Expand Down Expand Up @@ -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"
Expand Down