Add more changes

Divyaasm · Divyaasm · commit 78756182ff63 · 2024-04-09T16:05:26.000-07:00
Signed-off-by: Divya Madala &lt;divyaasm@amazon.com&gt;
diff --git a/benchmark.ini b/benchmark.ini
@@ -0,0 +1,32 @@
+[meta]
+config.version = 17
+
+[system]
+env.name = local
+
+[node]
+root.dir =
+src.root.dir =
+
+[source]
+remote.repo.url = https://github.com/opensearch-project/OpenSearch.git
+opensearch.src.subdir = opensearch
+
+[benchmarks]
+local.dataset.cache =
+
+[results_publishing]
+datastore.type = in-memory
+
+
+[workloads]
+default.url = https://github.com/rishabh6788/opensearch-benchmark-workloads
+
+[provision_configs]
+default.dir = default-provision-config
+
+[defaults]
+preserve_benchmark_candidate = false
+
+[distributions]
+release.cache = true
diff --git a/config.yml b/config.yml
@@ -0,0 +1,13 @@
+Description: Configuration file to store contants required to run rally for performance test
+Constants:
+  Repository: https://github.com/opensearch-project/opensearch-cluster-cdk
+  cidr: '172.31.0.0/16'
+  VpcId: 'vpc-0c413a9df7ca84d06'
+  AccountId: 724293578735
+  dataNodeStorage: 200
+  serverAccessType: prefixList
+  restrictServerAccessTo: pl-60b85b09
+  Region: us-east-1
+  Role: cfn-set-up
+  isInternal: 'false'
+  IamRoleArn: 'arn:aws:iam::724293578735:role/custom-benchmark-ec2-instance-role'
diff --git a/manifest.yml b/manifest.yml
@@ -0,0 +1,115 @@
+---
+schema-version: '1.1'
+build:
+  name: OpenSearch
+  version: 2.10.0
+  platform: linux
+  architecture: x64
+  distribution: tar
+  location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/dist/opensearch/opensearch-2.10.0-linux-x64.tar.gz
+  id: '8519'
+components:
+  - name: OpenSearch
+    repository: https://github.com/opensearch-project/OpenSearch.git
+    ref: eee49cb340edc6c4d489bcd9324dda571fc8dc03
+    commit_id: eee49cb340edc6c4d489bcd9324dda571fc8dc03
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.10.0-linux-x64.tar.gz
+  - name: common-utils
+    repository: https://github.com/opensearch-project/common-utils.git
+    ref: 0352c2f4827b0f0239206deb5c3224954d938be3
+    commit_id: 0352c2f4827b0f0239206deb5c3224954d938be3
+  - name: job-scheduler
+    repository: https://github.com/opensearch-project/job-scheduler.git
+    ref: e9d36379eedd1bbe9f11bc3e0512f87a8c808b58
+    commit_id: e9d36379eedd1bbe9f11bc3e0512f87a8c808b58
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-2.10.0.0.zip
+  - name: k-NN
+    repository: https://github.com/opensearch-project/k-NN.git
+    ref: e43701624f76b7076835395c8374d8c7d42adf47
+    commit_id: e43701624f76b7076835395c8374d8c7d42adf47
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-knn-2.10.0.0.zip
+  - name: geospatial
+    repository: https://github.com/opensearch-project/geospatial.git
+    ref: a3da2221d23bf4384020fe234fb97d46548b52c7
+    commit_id: a3da2221d23bf4384020fe234fb97d46548b52c7
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-geospatial-2.10.0.0.zip
+  - name: security
+    repository: https://github.com/opensearch-project/security.git
+    ref: 6daa697bcd4c73ea411bb765eddf2fac95a29065
+    commit_id: 6daa697bcd4c73ea411bb765eddf2fac95a29065
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.10.0.0.zip
+  - name: cross-cluster-replication
+    repository: https://github.com/opensearch-project/cross-cluster-replication.git
+    ref: dee2f600d214360d32415023a563eeccad103e77
+    commit_id: dee2f600d214360d32415023a563eeccad103e77
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-cross-cluster-replication-2.10.0.0.zip
+  - name: ml-commons
+    repository: https://github.com/opensearch-project/ml-commons.git
+    ref: 521214bb3f0a1e612f3af4ece74e1e3eb00686ed
+    commit_id: 521214bb3f0a1e612f3af4ece74e1e3eb00686ed
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-2.10.0.0.zip
+  - name: neural-search
+    repository: https://github.com/opensearch-project/neural-search.git
+    ref: 9476d435931315f0b646b3d9c654e80e5a02a828
+    commit_id: 9476d435931315f0b646b3d9c654e80e5a02a828
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-neural-search-2.10.0.0.zip
+  - name: notifications-core
+    repository: https://github.com/opensearch-project/notifications.git
+    ref: 0a9dfb0c4b54dbe37b304120b02699594bc9572c
+    commit_id: 0a9dfb0c4b54dbe37b304120b02699594bc9572c
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-notifications-core-2.10.0.0.zip
+  - name: notifications
+    repository: https://github.com/opensearch-project/notifications.git
+    ref: 0a9dfb0c4b54dbe37b304120b02699594bc9572c
+    commit_id: 0a9dfb0c4b54dbe37b304120b02699594bc9572c
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-notifications-2.10.0.0.zip
+  - name: opensearch-observability
+    repository: https://github.com/opensearch-project/observability.git
+    ref: d2c087c80f14c9a80566d0f5914e8fafd4f952ed
+    commit_id: d2c087c80f14c9a80566d0f5914e8fafd4f952ed
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-observability-2.10.0.0.zip
+  - name: opensearch-reports
+    repository: https://github.com/opensearch-project/reporting.git
+    ref: 3095e3cf1f56357bfe10690446da2adfe7782621
+    commit_id: 3095e3cf1f56357bfe10690446da2adfe7782621
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-reports-scheduler-2.10.0.0.zip
+  - name: sql
+    repository: https://github.com/opensearch-project/sql.git
+    ref: ef18b389ebd45f5078a8f7a53cb85eef7d25eae3
+    commit_id: ef18b389ebd45f5078a8f7a53cb85eef7d25eae3
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-sql-2.10.0.0.zip
+  - name: asynchronous-search
+    repository: https://github.com/opensearch-project/asynchronous-search.git
+    ref: a312d9afb1edc7fb4605a70af54f10be4bd054b3
+    commit_id: a312d9afb1edc7fb4605a70af54f10be4bd054b3
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-asynchronous-search-2.10.0.0.zip
+  - name: anomaly-detection
+    repository: https://github.com/opensearch-project/anomaly-detection.git
+    ref: bc4d8b18f33e281d863c5719667ce7d52331a9ba
+    commit_id: bc4d8b18f33e281d863c5719667ce7d52331a9ba
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-anomaly-detection-2.10.0.0.zip
+  - name: alerting
+    repository: https://github.com/opensearch-project/alerting.git
+    ref: dc1b9bf958b2dae4b3fdab8cee69894338417e9d
+    commit_id: dc1b9bf958b2dae4b3fdab8cee69894338417e9d
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-alerting-2.10.0.0.zip
+  - name: security-analytics
+    repository: https://github.com/opensearch-project/security-analytics.git
+    ref: e005b5a4686b9f65e4af2e85ee4d79f35e520572
+    commit_id: e005b5a4686b9f65e4af2e85ee4d79f35e520572
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-security-analytics-2.10.0.0.zip
+  - name: index-management
+    repository: https://github.com/opensearch-project/index-management.git
+    ref: 062badd9be2a7b0a3d73fd9f7e45f52d5fcdf685
+    commit_id: 062badd9be2a7b0a3d73fd9f7e45f52d5fcdf685
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-index-management-2.10.0.0.zip
+  - name: performance-analyzer
+    repository: https://github.com/opensearch-project/performance-analyzer.git
+    ref: 3ee56fc0d8f7168050fb7d2b066104650aec9710
+    commit_id: 3ee56fc0d8f7168050fb7d2b066104650aec9710
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-performance-analyzer-2.10.0.0.zip
+  - name: custom-codecs
+    repository: https://github.com/opensearch-project/custom-codecs.git
+    ref: 3437b438af35e93d321a232833f66e39131ff038
+    commit_id: 3437b438af35e93d321a232833f66e39131ff038
+    location: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/8519/linux/x64/tar/builds/opensearch/plugins/opensearch-custom-codecs-2.10.0.0.zip
diff --git a/src/test_workflow/benchmark_test/benchmark_create_cluster.py b/src/test_workflow/benchmark_test/benchmark_create_cluster.py
@@ -60,10 +60,10 @@ def __init__(
                 else:
                     params_list.append(f" -c {key}={value}")
         role_params = (
-            f" --require-approval=never --plugin cdk-assume-role-credential-plugin"
-            f" -c assume-role-credentials:writeIamRoleName={role} -c assume-role-credentials:readIamRoleName={role} "
+            f" --require-approval=never"
         )
         self.params = "".join(params_list) + role_params
+        self.password = None if self.args.insecure else get_password(self.args.distribution_version)
         self.is_endpoint_public = False
         self.stack_name = f"opensearch-infra-stack-{self.args.stack_suffix}"
         if self.manifest:
diff --git a/tests/jenkins/TestRunBenchmarkTestEndpoint.groovy b/tests/jenkins/TestRunBenchmarkTestEndpoint.groovy
@@ -106,7 +106,7 @@ class TestRunBenchmarkTestEndpoint extends BuildPipelineTest{
 
         assertThat(testScriptCommands.size(), equalTo(1))
         assertThat(testScriptCommands, hasItems(
-                "./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true                --test-procedure append-no-conflicts       --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()
+                "set +x && ./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true                  --test-procedure append-no-conflicts       --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()
         ))
     }
     @Test
@@ -127,7 +127,7 @@ class TestRunBenchmarkTestEndpoint extends BuildPipelineTest{
 
         assertThat(testScriptCommands.size(), equalTo(1))
         assertThat(testScriptCommands, hasItems(
-                "./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false --without-security               --test-procedure append-no-conflicts       --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()
+                "set +x && ./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false --without-security                 --test-procedure append-no-conflicts       --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()
         ))
     }
 
diff --git a/tests/jenkins/TestRunBenchmarkTestScriptDistributionUrl.groovy b/tests/jenkins/TestRunBenchmarkTestScriptDistributionUrl.groovy
@@ -131,7 +131,7 @@ class TestRunBenchmarkTestScriptDistributionUrl extends BuildPipelineTest {
 
         assertThat(testScriptCommands.size(), equalTo(1))
         assertThat(testScriptCommands, hasItems(
-                "./test.sh benchmark-test  --distribution-url https://artifacts.com/artifact.tar.gz --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false,jenkins-build-id:307 --without-security   --use-50-percent-heap    --suffix 307 --manager-node-count 3 --data-node-count 3    --data-instance-type r5-4xlarge  --test-procedure append-no-conflicts    --data-node-storage 100".toString()
+                "set +x && ./test.sh benchmark-test  --distribution-url https://artifacts.com/artifact.tar.gz --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false,jenkins-build-id:307 --without-security     --use-50-percent-heap    --suffix 307 --manager-node-count 3 --data-node-count 3    --data-instance-type r5-4xlarge  --test-procedure append-no-conflicts    --data-node-storage 100".toString()
         ))
     }
 
diff --git a/tests/jenkins/TestRunNonSecBenchmarkTestScript.groovy b/tests/jenkins/TestRunNonSecBenchmarkTestScript.groovy
@@ -26,11 +26,11 @@ class TestRunNonSecBenchmarkTestScript extends BuildPipelineTest{
     void setUp() {
         helper.registerSharedLibrary(
                 library().name('jenkins')
-                        .defaultVersion('5.11.0')
+                        .defaultVersion('cluster')
                         .allowOverride(true)
                         .implicit(true)
                         .targetPath('vars')
-                        .retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
+                        .retriever(gitSource('https://github.com/Divyyaasm/opensearch-build-libraries.git'))
                         .build()
         )
         helper.registerAllowedMethod("s3Download", [Map])
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt
@@ -145,7 +145,7 @@
                   runBenchmarkTestScript.withCredentials([DATASTORE_USER, DATASTORE_PASSWORD], groovy.lang.Closure)
                      runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini})
                      runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=})
-                  runBenchmarkTestScript.sh(./test.sh benchmark-test  --distribution-url https://artifacts.com/artifact.tar.gz --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false,jenkins-build-id:307 --without-security   --use-50-percent-heap    --suffix 307 --manager-node-count 3 --data-node-count 3    --data-instance-type r5-4xlarge  --test-procedure append-no-conflicts    --data-node-storage 100)
+                  runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test  --distribution-url https://artifacts.com/artifact.tar.gz --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false,jenkins-build-id:307 --without-security     --use-50-percent-heap    --suffix 307 --manager-node-count 3 --data-node-count 3    --data-instance-type r5-4xlarge  --test-procedure append-no-conflicts    --data-node-storage 100)
                Messages.asBoolean()
                Messages.asBoolean()
                Messages.get([benchmark-test])
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-endpoint-insecure.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-endpoint-insecure.jenkinsfile.txt
@@ -28,6 +28,6 @@
                   runBenchmarkTestScript.withCredentials([DATASTORE_USER, DATASTORE_PASSWORD], groovy.lang.Closure)
                      runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini})
                      runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=})
-                  runBenchmarkTestScript.sh(./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true                --test-procedure append-no-conflicts       --telemetry-params '{"telemetry_setting":"value"}')
+                  runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true                  --test-procedure append-no-conflicts       --telemetry-params '{"telemetry_setting":"value"}')
          benchmark-test-endpoint.postCleanup()
             postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-endpoint-secure.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-endpoint-secure.jenkinsfile.txt
@@ -28,6 +28,6 @@
                   runBenchmarkTestScript.withCredentials([DATASTORE_USER, DATASTORE_PASSWORD], groovy.lang.Closure)
                      runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini})
                      runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=})
-                  runBenchmarkTestScript.sh(./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true                --test-procedure append-no-conflicts       --telemetry-params '{"telemetry_setting":"value"}')
+                  runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test    --cluster-endpoint opensearch-ABCxdfdfhyfk.com  --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true                  --test-procedure append-no-conflicts       --telemetry-params '{"telemetry_setting":"value"}')
          benchmark-test-endpoint.postCleanup()
             postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt
@@ -1,6 +1,6 @@
    benchmark-test.run()
-      benchmark-test.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git})
-      benchmark-test.library({identifier=jenkins@5.11.0, retriever=null})
+      benchmark-test.modernSCM({$class=GitSCMSource, remote=https://github.com/Divyaasm/opensearch-build-libraries.git})
+      benchmark-test.library({identifier=jenkins@cluster, retriever=null})
       benchmark-test.pipeline(groovy.lang.Closure)
          benchmark-test.timeout({time=24, unit=HOURS})
          benchmark-test.logRotator({daysToKeepStr=30})

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class TestRunBenchmarkTestEndpoint extends BuildPipelineTest{`
`106`	`106`
`107`	`107`	`assertThat(testScriptCommands.size(), equalTo(1))`
`108`	`108`	`assertThat(testScriptCommands, hasItems(`
`109`		`- "./test.sh benchmark-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()`
	`109`	`+ "set +x && ./test.sh benchmark-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()`
`110`	`110`	`))`
`111`	`111`	`}`
`112`	`112`	`@Test`
`@@ -127,7 +127,7 @@ class TestRunBenchmarkTestEndpoint extends BuildPipelineTest{`
`127`	`127`
`128`	`128`	`assertThat(testScriptCommands.size(), equalTo(1))`
`129`	`129`	`assertThat(testScriptCommands, hasItems(`
`130`		`- "./test.sh benchmark-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false --without-security --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()`
	`130`	`+ "set +x && ./test.sh benchmark-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false --without-security --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()`
`131`	`131`	`))`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class TestRunBenchmarkTestScriptDistributionUrl extends BuildPipelineTest {`
`131`	`131`
`132`	`132`	`assertThat(testScriptCommands.size(), equalTo(1))`
`133`	`133`	`assertThat(testScriptCommands, hasItems(`
`134`		- "./test.sh benchmark-test --distribution-url https://artifacts.com/artifact.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false,jenkins-build-id:307 --without-security --use-50-percent-heap --suffix 307 --manager-node-count 3 --data-node-count 3 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100".toString()
	`134`	+ "set +x && ./test.sh benchmark-test --distribution-url https://artifacts.com/artifact.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:false,jenkins-build-id:307 --without-security --use-50-percent-heap --suffix 307 --manager-node-count 3 --data-node-count 3 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100".toString()
`135`	`135`	`))`
`136`	`136`	`}`
`137`	`137`