Skip to content

PMM-14778 Add USE_ONDEMAND parameter to switch from spot to on-demand instances #3924

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

Open
talhabinrizwan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PMM-14778 Add USE_ONDEMAND parameter to switch from spot to on-demand instances #3924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb6c65a
PMM-14778 Add USE_ONDEMAND parameter to switch pmm v3 pipelines from …
talhabinrizwan Mar 27, 2026
dffe953
Merge branch 'master' into PMM-14778-on-deman-instances
talhabinrizwan Mar 27, 2026
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
7 changes: 6 additions & 1 deletion pmm/v3/pmm3-ami.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pipeline {
agent {
label 'agent-amd64-ol9'
label params.USE_ONDEMAND ? 'agent-amd64-ol9-ondemand' : 'agent-amd64-ol9'
}
parameters {
string(
Expand All @@ -19,6 +19,11 @@ pipeline {
choices: ['no', 'yes'],
description: "Build a Release Candidate?",
name: 'RELEASE_CANDIDATE')
booleanParam(
defaultValue: false,
description: 'Use on-demand instances instead of spot (for RC/Release builds)',
name: 'USE_ONDEMAND'
)
}
options {
buildDiscarder(logRotator(numToKeepStr: '30'))
Expand Down
7 changes: 6 additions & 1 deletion pmm/v3/pmm3-client-autobuild-amd.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ library changelog: false, identifier: 'v3lib@master', retriever: modernSCM(

pipeline {
agent {
label 'agent-amd64-ol9'
label params.USE_ONDEMAND ? 'agent-amd64-ol9-ondemand' : 'agent-amd64-ol9'
}
parameters {
string(
Expand All @@ -23,6 +23,11 @@ pipeline {
description: 'Publish packages to repositories: testing for RC, experimental for 3-dev-latest',
name: 'DESTINATION'
)
booleanParam(
defaultValue: false,
description: 'Use on-demand instances instead of spot (for RC/Release builds)',
name: 'USE_ONDEMAND'
)
}
options {
buildDiscarder(logRotator(numToKeepStr: '30'))
Expand Down
7 changes: 6 additions & 1 deletion pmm/v3/pmm3-client-autobuild-arm.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ library changelog: false, identifier: 'v3lib@master', retriever: modernSCM(

pipeline {
agent {
label 'agent-arm64-ol9'
label params.USE_ONDEMAND ? 'agent-arm64-ol9-ondemand' : 'agent-arm64-ol9'
}
parameters {
string(
Expand All @@ -23,6 +23,11 @@ pipeline {
description: 'Publish packages to repositories: testing for RC, experimental for 3-dev-latest',
name: 'DESTINATION'
)
booleanParam(
defaultValue: false,
description: 'Use on-demand instances instead of spot (for RC/Release builds)',
name: 'USE_ONDEMAND'
)
}
options {
buildDiscarder(logRotator(numToKeepStr: '30'))
Expand Down
13 changes: 10 additions & 3 deletions pmm/v3/pmm3-client-autobuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pipeline {
agent {
label 'cli'
label params.USE_ONDEMAND ? 'cli-ondemand' : 'cli'
}
parameters {
string(
Expand All @@ -11,6 +11,11 @@ pipeline {
choices: ['experimental', 'testing'],
description: 'Publish packages to repositories: testing (for RC), experimental: (for dev-latest)',
name: 'DESTINATION')
booleanParam(
defaultValue: false,
description: 'Use on-demand instances instead of spot (for RC/Release builds)',
name: 'USE_ONDEMAND'
)
}
options {
buildDiscarder(logRotator(numToKeepStr: '30'))
Expand Down Expand Up @@ -54,7 +59,8 @@ pipeline {
script {
pmmClientAmd64 = build job: 'pmm3-client-autobuild-amd', parameters: [
string(name: 'GIT_BRANCH', value: params.GIT_BRANCH),
string(name: 'DESTINATION', value: params.DESTINATION)
string(name: 'DESTINATION', value: params.DESTINATION),
booleanParam(name: 'USE_ONDEMAND', value: params.USE_ONDEMAND)
]
env.TARBALL_AMD64_URL = pmmClientAmd64.buildVariables.TARBALL_URL
env.TARBALL_AMD64_DYNAMIC_OL8_URL = pmmClientAmd64.buildVariables.TARBALL_AMD64_DYNAMIC_OL8_URL
Expand All @@ -67,7 +73,8 @@ pipeline {
script {
pmmClientArm64 = build job: 'pmm3-client-autobuild-arm', parameters: [
string(name: 'GIT_BRANCH', value: params.GIT_BRANCH),
string(name: 'DESTINATION', value: params.DESTINATION)
string(name: 'DESTINATION', value: params.DESTINATION),
booleanParam(name: 'USE_ONDEMAND', value: params.USE_ONDEMAND)
]
env.TARBALL_ARM64_URL = pmmClientArm64.buildVariables.TARBALL_URL
}
Expand Down
7 changes: 6 additions & 1 deletion pmm/v3/pmm3-image-scanning.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This job helps run an image scan with Trivy

pipeline {
agent {
label 'agent-amd64-ol9'
label params.USE_ONDEMAND ? 'agent-amd64-ol9-ondemand' : 'agent-amd64-ol9'
Copy link
Copy Markdown
Member

@ademidoff ademidoff Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, we don't need this one to be on-demand :)

}
parameters {
string(
Expand All @@ -15,6 +15,11 @@ pipeline {
defaultValue: 'perconalab/pmm-server:3-dev-latest',
description: 'PMM Server image with tag to scan',
name: 'PMM_SERVER_IMAGE')
booleanParam(
defaultValue: false,
description: 'Use on-demand instances instead of spot (for RC/Release builds)',
name: 'USE_ONDEMAND'
)
}
stages {
stage('Install Trivy') {
Expand Down
17 changes: 11 additions & 6 deletions pmm/v3/pmm3-release-candidate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ String DEFAULT_BRANCH = 'v3'

pipeline {
agent {
label 'agent-amd64-ol9'
label 'agent-amd64-ol9-ondemand'
}
parameters {
string(
Expand Down Expand Up @@ -265,7 +265,8 @@ pipeline {
script {
def pmmServer = build job: 'pmm3-server-autobuild', parameters: [
string(name: 'GIT_BRANCH', value: RELEASE_BRANCH),
string(name: 'DESTINATION', value: 'testing')
string(name: 'DESTINATION', value: 'testing'),
booleanParam(name: 'USE_ONDEMAND', value: true)
]
env.PMM_SERVER_IMAGE = pmmServer.buildVariables.TIMESTAMP_TAG
}
Expand All @@ -276,7 +277,8 @@ pipeline {
script {
def pmmClient = build job: 'pmm3-client-autobuild', parameters: [
string(name: 'GIT_BRANCH', value: RELEASE_BRANCH),
string(name: 'DESTINATION', value: 'testing')
string(name: 'DESTINATION', value: 'testing'),
booleanParam(name: 'USE_ONDEMAND', value: true)
]
env.TARBALL_AMD64_URL = pmmClient.buildVariables.TARBALL_AMD64_URL
env.TARBALL_ARM64_URL = pmmClient.buildVariables.TARBALL_ARM64_URL
Expand All @@ -291,7 +293,8 @@ pipeline {
script {
def pmmWatchtower = build job: 'pmm3-watchtower-autobuild', parameters: [
string(name: 'GIT_BRANCH', value: RELEASE_BRANCH),
string(name: 'TAG_TYPE', value: 'rc')
string(name: 'TAG_TYPE', value: 'rc'),
booleanParam(name: 'USE_ONDEMAND', value: true)
]
env.WATCHTOWER_IMAGE = pmmWatchtower.buildVariables.TIMESTAMP_TAG
}
Expand All @@ -311,7 +314,8 @@ pipeline {
string(name: 'PMM_BRANCH', value: "pmm-${VERSION}"),
string(name: 'PMM_SERVER_IMAGE', value: "docker.io/${PMM_SERVER_IMAGE}"),
string(name: 'WATCHTOWER_IMAGE', value: "docker.io/${WATCHTOWER_IMAGE}"),
string(name: 'RELEASE_CANDIDATE', value: "yes")
string(name: 'RELEASE_CANDIDATE', value: "yes"),
booleanParam(name: 'USE_ONDEMAND', value: true)
]
env.AMI_ID = pmmAMI.buildVariables.AMI_ID
}
Expand Down Expand Up @@ -339,7 +343,8 @@ pipeline {
script {
def imageScan = build job: 'pmm3-image-scanning', propagate: false, parameters: [
string(name: 'PMM_CLIENT_IMAGE', value: "perconalab/pmm-client:${VERSION}-rc"),
string(name: 'PMM_SERVER_IMAGE', value: "perconalab/pmm-server:${VERSION}-rc")
string(name: 'PMM_SERVER_IMAGE', value: "perconalab/pmm-server:${VERSION}-rc"),
booleanParam(name: 'USE_ONDEMAND', value: true)
]

env.SCAN_REPORT_URL = ""
Expand Down
3 changes: 2 additions & 1 deletion pmm/v3/pmm3-release.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,8 @@ ENDSSH
script {
imageScan = build job: 'pmm3-image-scanning', propagate: false, parameters: [
string(name: 'PMM_CLIENT_IMAGE', value: "perconalab/pmm-client:${VERSION}"),
string(name: 'PMM_SERVER_IMAGE', value: "perconalab/pmm-server:${VERSION}")
string(name: 'PMM_SERVER_IMAGE', value: "perconalab/pmm-server:${VERSION}"),
booleanParam(name: 'USE_ONDEMAND', value: true)
]

env.SCAN_REPORT_URL = ""
Expand Down
7 changes: 6 additions & 1 deletion pmm/v3/pmm3-server-autobuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ library changelog: false, identifier: 'lib@master', retriever: modernSCM([

pipeline {
agent {
label 'agent-amd64-ol9'
label params.USE_ONDEMAND ? 'agent-amd64-ol9-ondemand' : 'agent-amd64-ol9'
}
parameters {
string(
Expand All @@ -17,6 +17,11 @@ pipeline {
choices: ['experimental', 'testing'],
description: 'Repository to push packages to',
name: 'DESTINATION')
booleanParam(
defaultValue: false,
description: 'Use on-demand instances instead of spot (for RC/Release builds)',
name: 'USE_ONDEMAND'
)
}
options {
buildDiscarder(logRotator(numToKeepStr: '30'))
Expand Down
7 changes: 6 additions & 1 deletion pmm/v3/pmm3-watchtower-autobuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ library changelog: false, identifier: 'lib@master', retriever: modernSCM([

pipeline {
agent {
label 'agent-amd64-ol9'
label params.USE_ONDEMAND ? 'agent-amd64-ol9-ondemand' : 'agent-amd64-ol9'
}
parameters {
string(
Expand All @@ -18,6 +18,11 @@ pipeline {
description: 'Tag type for the watchtower build, e.g. "dev-latest", "rc"',
name: 'TAG_TYPE'
)
booleanParam(
defaultValue: false,
description: 'Use on-demand instances instead of spot (for RC/Release builds)',
name: 'USE_ONDEMAND'
)
}
options {
buildDiscarder(logRotator(numToKeepStr: '30'))
Expand Down