fix(perf-v17): add provision_type on_demand to all v17 performance pipelines

Copilot · fruch · fruch · commit 4e955c892560 · 2025-10-28T21:28:31.000+02:00
Added provision_type: 'on_demand' parameter to all 22 jenkinsfiles in the branch-perf-v17 folder to ensure performance tests use on-demand instances instead of spot instances, avoiding wasted time. Co-authored-by: fruch <340979+fruch@users.noreply.github.com> (cherry picked from commit 6127a92)
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-manager-native-backup-nemesis.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-manager-native-backup-nemesis.jenkinsfile
@@ -7,6 +7,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_manager_backup_test.PerformanceRegressionManagerBackupTest.test_manager_backup",
     test_config: """["test-cases/performance/perf-regression-latency-backup-nemesis.yaml", "configurations/kms-ear.yaml", "configurations/performance/latency-decorator-error-thresholds-nemesis-ent-tablets.yaml", "configurations/manager/manager_native_backup_nemesis.yaml", "configurations/manager/2TB_backup_dataset.yaml"]""",
 )
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-manager-rclone-backup-nemesis.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-manager-rclone-backup-nemesis.jenkinsfile
@@ -7,6 +7,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_manager_backup_test.PerformanceRegressionManagerBackupTest.test_manager_backup",
     test_config: """["test-cases/performance/perf-regression-latency-backup-nemesis.yaml", "configurations/kms-ear.yaml", "configurations/performance/latency-decorator-error-thresholds-nemesis-ent-tablets.yaml", "configurations/manager/manager_rclone_backup_nemesis.yaml", "configurations/manager/2TB_backup_dataset.yaml"]""",
 )
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-during-rolling-upgrade-tablets.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-during-rolling-upgrade-tablets.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     base_versions: '',  // auto mode
     backend: "aws",
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionUpgradeTest",
     test_config: """["test-cases/performance/perf-regression-latency-650gb-upgrade.yaml", "configurations/disable_kms.yaml"]""",
     sub_tests: ["test_latency_write_with_upgrade", "test_latency_read_with_upgrade", "test_latency_mixed_with_upgrade"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-during-rolling-upgrade.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-during-rolling-upgrade.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     base_versions: '',  // auto mode
     backend: "aws",
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionUpgradeTest",
     test_config: """["test-cases/performance/perf-regression-latency-650gb-upgrade.yaml", "configurations/tablets_disabled.yaml", "configurations/disable_kms.yaml"]""",
     sub_tests: ["test_latency_write_with_upgrade", "test_latency_read_with_upgrade", "test_latency_mixed_with_upgrade"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-elasticity.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-elasticity.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     availability_zone: 'a',
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionTest",
     test_config: """["test-cases/performance/perf-regression-latency-650gb-elasticity.yaml", "configurations/performance/cassandra-stress-650gb-8-col-i4i-80-percent-throughput-ent.yaml", "configurations/disable_kms.yaml"]""",
     sub_tests: ["test_latency_write_with_nemesis", "test_latency_read_with_nemesis", "test_latency_mixed_with_nemesis"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-with-nemesis-rbno-disabled.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-with-nemesis-rbno-disabled.jenkinsfile
@@ -5,6 +5,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 
 perfRegressionParallelPipeline(
     backend: "aws",
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionTest",
     test_config: """["test-cases/performance/perf-regression-latency-650gb-with-nemesis.yaml", "configurations/disable_simulated_racks.yaml", "configurations/tablets_disabled.yaml", "configurations/disable_kms.yaml","configurations/disable_rbno.yaml", "configurations/performance/latency-decorator-error-thresholds-nemesis-ent-vnodes.yaml"]""",
     sub_tests: ["test_latency_write_with_nemesis", "test_latency_read_with_nemesis", "test_latency_mixed_with_nemesis"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-with-nemesis-tablets.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-with-nemesis-tablets.jenkinsfile
@@ -5,6 +5,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 
 perfRegressionParallelPipeline(
     backend: "aws",
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionTest",
     test_config: """["test-cases/performance/perf-regression-latency-650gb-with-nemesis.yaml", "configurations/disable_kms.yaml", "configurations/performance/latency-decorator-error-thresholds-nemesis-ent-tablets.yaml"]""",
     sub_tests: ["test_latency_write_with_nemesis", "test_latency_read_with_nemesis", "test_latency_mixed_with_nemesis"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-with-nemesis.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-latency-650gb-with-nemesis.jenkinsfile
@@ -5,6 +5,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 
 perfRegressionParallelPipeline(
     backend: "aws",
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionTest",
     test_config: """["test-cases/performance/perf-regression-latency-650gb-with-nemesis.yaml", "configurations/disable_simulated_racks.yaml", "configurations/tablets_disabled.yaml", "configurations/disable_kms.yaml", "configurations/performance/latency-decorator-error-thresholds-nemesis-ent-vnodes.yaml"]""",
     sub_tests: ["test_latency_write_with_nemesis", "test_latency_read_with_nemesis", "test_latency_mixed_with_nemesis"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-tablets.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-tablets.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_gradual_grow_throughput.PerformanceRegressionPredefinedStepsTest",
     test_config: '''["test-cases/performance/perf-regression-predefined-throughput-steps.yaml", "configurations/performance/cassandra_stress_gradual_load_steps_enterprise.yaml", "configurations/disable_kms.yaml", "configurations/disable_speculative_retry.yaml", "configurations/performance/latency-decorator-error-thresholds-steps-ent-tablets.yaml"]''',
     sub_tests: ["test_read_gradual_increase_load", "test_mixed_gradual_increase_load"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-vnodes.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-vnodes.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_gradual_grow_throughput.PerformanceRegressionPredefinedStepsTest",
     test_config: '''["test-cases/performance/perf-regression-predefined-throughput-steps.yaml", "configurations/performance/cassandra_stress_gradual_load_steps_enterprise.yaml", "configurations/disable_kms.yaml", "configurations/tablets_disabled.yaml", "configurations/disable_speculative_retry.yaml", "configurations/performance/latency-decorator-error-thresholds-steps-ent-vnodes.yaml"]''',
     sub_tests: ["test_read_gradual_increase_load", "test_mixed_gradual_increase_load"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-write-tablets.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-write-tablets.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_gradual_grow_throughput.PerformanceRegressionPredefinedStepsTest",
     test_config: '''["test-cases/performance/perf-regression-predefined-throughput-steps.yaml", "configurations/performance/cassandra_stress_gradual_load_steps_enterprise.yaml", "configurations/disable_kms.yaml", "configurations/disable_speculative_retry.yaml", "configurations/performance/latency-decorator-error-thresholds-steps-ent-tablets.yaml"]''',
     sub_tests: ["test_write_gradual_increase_load"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-write-vnodes.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-regression-predefined-throughput-steps-write-vnodes.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_gradual_grow_throughput.PerformanceRegressionPredefinedStepsTest",
     test_config: '''["test-cases/performance/perf-regression-predefined-throughput-steps.yaml", "configurations/performance/cassandra_stress_gradual_load_steps_enterprise.yaml", "configurations/disable_kms.yaml", "configurations/tablets_disabled.yaml", "configurations/disable_speculative_retry.yaml", "configurations/performance/latency-decorator-error-thresholds-steps-ent-vnodes.yaml"]''',
     sub_tests: ["test_write_gradual_increase_load"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_arm64-write.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_arm64-write.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 longevityPipeline(
     backend: 'aws',
     region: 'eu-west-1',
+    provision_type: 'on_demand',
     test_name: 'microbenchmarking_test.PerfSimpleQueryTest.test_perf_simple_query',
     test_config: """[ 'test-cases/microbenchmarking/amazon_perf_simple_query_ARM.yaml', 'configurations/performance/perf_simple/perf_simple_write_option.yaml' ]""",
     email_recipients: "scylla-perf-results@scylladb.com",
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_arm64.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_arm64.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 longevityPipeline(
     backend: 'aws',
     region: 'eu-west-1',
+    provision_type: 'on_demand',
     test_name: 'microbenchmarking_test.PerfSimpleQueryTest.test_perf_simple_query',
     test_config: """["test-cases/microbenchmarking/amazon_perf_simple_query_ARM.yaml","configurations/performance/perf_simple/latency-decorator-error-thresholds-perf-simple-query-microbenchmark_arm64.yaml"]""",
     email_recipients: "scylla-perf-results@scylladb.com",
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_x86_64-write.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_x86_64-write.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 longevityPipeline(
     backend: 'aws',
     region: 'eu-west-1',
+    provision_type: 'on_demand',
     test_name: 'microbenchmarking_test.PerfSimpleQueryTest.test_perf_simple_query',
     test_config: """[ 'test-cases/microbenchmarking/amazon_perf_simple_query_ARM.yaml', 'test-cases/microbenchmarking/amazon_perf_simple_query_x86.yaml', 'configurations/performance/perf_simple/perf_simple_write_option.yaml' ]""",
     email_recipients: "scylla-perf-results@scylladb.com",
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_x86_64.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-enterprise/perf-regression/scylla-enterprise-perf-simple-query-weekly-microbenchmark_x86_64.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 longevityPipeline(
     backend: 'aws',
     region: 'eu-west-1',
+    provision_type: 'on_demand',
     test_name: 'microbenchmarking_test.PerfSimpleQueryTest.test_perf_simple_query',
     test_config: """[ 'test-cases/microbenchmarking/amazon_perf_simple_query_ARM.yaml', 'test-cases/microbenchmarking/amazon_perf_simple_query_x86.yaml', 'configurations/performance/perf_simple/latency-decorator-error-thresholds-perf-simple-query-microbenchmark_x86_64.yaml' ]""",
     email_recipients: "scylla-perf-results@scylladb.com",
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-features/compression/features-lz4-dict-compression.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-features/compression/features-lz4-dict-compression.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_gradual_grow_throughput.PerformanceRegressionPredefinedStepsTest",
     test_config: '''[
     "test-cases/performance/perf-regression-predefined-throughput-steps.yaml",
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-features/compression/features-zstd-dict-compression.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-features/compression/features-zstd-dict-compression.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_gradual_grow_throughput.PerformanceRegressionPredefinedStepsTest",
     test_config: '''[
     "test-cases/performance/perf-regression-predefined-throughput-steps.yaml",
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/latte-perf-regression-latency-steady-state-custom-d1-workload1-tablets.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/latte-perf-regression-latency-steady-state-custom-d1-workload1-tablets.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "gce",
     region: "us-east1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionTest",
     test_config: '''["configurations/performance/latte-perf-regression-latency-steady-state-custom-d1-workload1.yaml", "configurations/disable_kms.yaml"]''',
     sub_tests: ["test_latency_steady_state"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/latte-perf-regression-latency-steady-state-custom-d1-workload1-vnodes.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/latte-perf-regression-latency-steady-state-custom-d1-workload1-vnodes.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "gce",
     region: "us-east1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_test.PerformanceRegressionTest",
     test_config: '''["configurations/performance/latte-perf-regression-latency-steady-state-custom-d1-workload1.yaml", "configurations/tablets_disabled.yaml", "configurations/disable_kms.yaml"]''',
     sub_tests: ["test_latency_steady_state"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/perf-regression-predefined-throughput-steps-sanity-vnodes.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/perf-regression-predefined-throughput-steps-sanity-vnodes.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_gradual_grow_throughput.PerformanceRegressionPredefinedStepsTest",
     test_config: '''["test-cases/performance/perf-regression-predefined-throughput-steps.yaml", "configurations/performance/cassandra_stress_gradual_load_reduced_steps_number.yaml", "configurations/disable_kms.yaml", "configurations/tablets_disabled.yaml", "configurations/disable_speculative_retry.yaml", "configurations/performance/latency-decorator-error-thresholds-steps-ent-vnodes.yaml"]''',
     sub_tests: ["test_read_gradual_increase_load", "test_mixed_gradual_increase_load", "test_write_gradual_increase_load"],
diff --git a/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/scylla-release-perf-regression-alternator.jenkinsfile b/jenkins-pipelines/performance/branch-perf-v17/scylla-master/perf-regression/scylla-release-perf-regression-alternator.jenkinsfile
@@ -6,6 +6,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)
 perfRegressionParallelPipeline(
     backend: "aws",
     region: "us-east-1",
+    provision_type: 'on_demand',
     test_name: "performance_regression_alternator_test.PerformanceRegressionAlternatorTest",
     test_config: "test-cases/performance/perf-regression-alternator-full.yaml",
     sub_tests: ["test_full"],

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ def lib = library identifier: 'sct@snapshot', retriever: legacySCM(scm)`
`7`	`7`	`perfRegressionParallelPipeline(`
`8`	`8`	`backend: "aws",`
`9`	`9`	`region: "us-east-1",`
	`10`	`+ provision_type: 'on_demand',`
`10`	`11`	`test_name: "performance_regression_manager_backup_test.PerformanceRegressionManagerBackupTest.test_manager_backup",`
`11`	`12`	`test_config: """["test-cases/performance/perf-regression-latency-backup-nemesis.yaml", "configurations/kms-ear.yaml", "configurations/performance/latency-decorator-error-thresholds-nemesis-ent-tablets.yaml", "configurations/manager/manager_native_backup_nemesis.yaml", "configurations/manager/2TB_backup_dataset.yaml"]""",`
`12`	`13`	`)`