From e50674436b0fc3d36c333bc105d451519e7053b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 6 Aug 2024 20:53:20 +0000 Subject: [PATCH] update jenkins tests with new execute-test command (#471) Signed-off-by: Michael Oviedo (cherry picked from commit 1042431b33de19f220186749f02cf7c23649aa62) Signed-off-by: github-actions[bot] --- tests/jenkins/TestRunBenchmarkTestScript.groovy | 5 +++-- tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy | 5 +++-- tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy | 7 ++++--- .../jenkins/TestRunBenchmarkTestScriptWithEndpoint.groovy | 3 ++- tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile | 6 ++++-- tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt | 8 ++++---- tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile | 6 ++++-- .../jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt | 8 ++++---- tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile | 1 + .../jobs/BenchmarkTestWithEndpoint_Jenkinsfile.txt | 4 ++-- tests/jenkins/jobs/BenchmarkTest_Jenkinsfile | 6 ++++-- tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt | 8 ++++---- .../lib-testers/RunBenchmarkTestEndpointLibTest.groovy | 5 ++++- .../lib-testers/RunBenchmarkTestScriptLibTest.groovy | 5 ++++- vars/runBenchmarkTestScript.groovy | 1 + 15 files changed, 48 insertions(+), 30 deletions(-) diff --git a/tests/jenkins/TestRunBenchmarkTestScript.groovy b/tests/jenkins/TestRunBenchmarkTestScript.groovy index 3e6386140..e66a8cb1c 100644 --- a/tests/jenkins/TestRunBenchmarkTestScript.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScript.groovy @@ -21,6 +21,7 @@ class TestRunBenchmarkTestScript extends BuildPipelineTest { @Before void setUp() { this.registerLibTester(new RunBenchmarkTestScriptLibTester( + 'execute-test', 'tests/data/opensearch-1.3.0-bundle.yml', '', '', @@ -87,10 +88,10 @@ class TestRunBenchmarkTestScript extends BuildPipelineTest { assertThat(testScriptCommands.size(), equalTo(2)) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) } diff --git a/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy b/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy index c16b7de12..485d2a4db 100644 --- a/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy @@ -21,6 +21,7 @@ class TestRunBenchmarkTestScriptMultiNode extends BuildPipelineTest { @Before void setUp() { this.registerLibTester(new RunBenchmarkTestScriptLibTester( + 'execute-test', 'tests/data/opensearch-1.3.0-bundle.yml', '', '', @@ -62,10 +63,10 @@ class TestRunBenchmarkTestScriptMultiNode extends BuildPipelineTest { assertThat(testScriptCommands.size(), equalTo(2)) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() )) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() )) } diff --git a/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy b/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy index d0206d44c..76545ffd9 100644 --- a/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy @@ -21,8 +21,9 @@ class TestRunBenchmarkTestScriptNoManifest extends BuildPipelineTest { @Before void setUp() { this.registerLibTester(new RunBenchmarkTestScriptLibTester( + 'execute-test', '', - 'https://www.exmaple.com/example.tar.gz', + 'https://www.example.com/example.tar.gz', '3.0.0', 'true', 'nyc_taxis', @@ -61,10 +62,10 @@ class TestRunBenchmarkTestScriptNoManifest extends BuildPipelineTest { assertThat(testScriptCommands.size(), equalTo(2)) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test --distribution-url https://www.exmaple.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test --distribution-url https://www.exmaple.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) } diff --git a/tests/jenkins/TestRunBenchmarkTestScriptWithEndpoint.groovy b/tests/jenkins/TestRunBenchmarkTestScriptWithEndpoint.groovy index 20fe9fa59..6f8d26f32 100644 --- a/tests/jenkins/TestRunBenchmarkTestScriptWithEndpoint.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScriptWithEndpoint.groovy @@ -22,6 +22,7 @@ class TestRunBenchmarkTestScriptWithEndpoint extends BuildPipelineTest { @Before void setUp() { this.registerLibTester(new RunBenchmarkTestEndpointLibTester( + 'execute-test', 'opensearch-ABCxdfdfhyfk.com', 'false', 'nyc_taxis', @@ -51,7 +52,7 @@ class TestRunBenchmarkTestScriptWithEndpoint extends BuildPipelineTest { assertThat(testScriptCommands.size(), equalTo(1)) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag true,security-enabled:true" + "set +x && ./test.sh benchmark-test execute-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag true,security-enabled:true" )) } diff --git a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile index e36711039..d0ce58387 100644 --- a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile +++ b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile @@ -18,7 +18,8 @@ pipeline { url: BUNDLE_MANIFEST_URL, path: BUNDLE_MANIFEST ) - runBenchmarkTestScript(bundleManifest: BUNDLE_MANIFEST, + runBenchmarkTestScript(command: COMMAND, + bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, workload: TEST_WORKLOAD, @@ -57,7 +58,8 @@ pipeline { url: BUNDLE_MANIFEST_URL, path: BUNDLE_MANIFEST ) - runBenchmarkTestScript(bundleManifest: BUNDLE_MANIFEST, + runBenchmarkTestScript(command: COMMAND, + bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, workload: TEST_WORKLOAD, diff --git a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt index 91cf70985..f9445f942 100644 --- a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt @@ -11,7 +11,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307-secure, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) + BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307-secure, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@6.7.2, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -30,7 +30,7 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') BenchmarkTestMultinode_Jenkinsfile.stage(test-without-security, groovy.lang.Closure) BenchmarkTestMultinode_Jenkinsfile.script(groovy.lang.Closure) BenchmarkTestMultinode_Jenkinsfile.downloadBuildManifest({url=test://artifact.url, path=tests/data/opensearch-1.3.0-bundle.yml}) @@ -41,7 +41,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) + BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@6.7.2, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -60,4 +60,4 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') diff --git a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile index f51397f1a..28533d4e3 100644 --- a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile +++ b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile @@ -14,7 +14,8 @@ pipeline { stage('test-with-security') { steps { script { - runBenchmarkTestScript(bundleManifest: BUNDLE_MANIFEST, + runBenchmarkTestScript(command: COMMAND, + bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, workload: TEST_WORKLOAD, @@ -49,7 +50,8 @@ pipeline { stage('test-without-security') { steps { script { - runBenchmarkTestScript(bundleManifest: BUNDLE_MANIFEST, + runBenchmarkTestScript(command: COMMAND, + bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, workload: TEST_WORKLOAD, diff --git a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt index 3a79811b3..4d42d43e5 100644 --- a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt @@ -3,7 +3,7 @@ BenchmarkTestNoManifest_Jenkinsfile.echo(Executing on agent [label:none]) BenchmarkTestNoManifest_Jenkinsfile.stage(test-with-security, groovy.lang.Closure) BenchmarkTestNoManifest_Jenkinsfile.script(groovy.lang.Closure) - BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({bundleManifest=, distributionUrl=https://www.exmaple.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://www.example.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@6.7.2, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -17,10 +17,10 @@ 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(set +x && ./test.sh benchmark-test --distribution-url https://www.exmaple.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) BenchmarkTestNoManifest_Jenkinsfile.stage(test-without-security, groovy.lang.Closure) BenchmarkTestNoManifest_Jenkinsfile.script(groovy.lang.Closure) - BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({bundleManifest=, distributionUrl=https://www.exmaple.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://www.example.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@6.7.2, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -34,4 +34,4 @@ 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(set +x && ./test.sh benchmark-test --distribution-url https://www.exmaple.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) diff --git a/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile b/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile index 4bf5eed08..b2f587e37 100644 --- a/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile +++ b/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile @@ -14,6 +14,7 @@ pipeline { steps { script { runBenchmarkTestScript( + command: COMMAND, endpoint: CLUSTER_ENDPOINT, insecure: "false", workload: TEST_WORKLOAD, diff --git a/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile.txt b/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile.txt index f1115a354..40e2f2f34 100644 --- a/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BenchmarkTestWithEndpoint_Jenkinsfile.txt @@ -3,7 +3,7 @@ BenchmarkTestWithEndpoint_Jenkinsfile.echo(Executing on agent [label:none]) BenchmarkTestWithEndpoint_Jenkinsfile.stage(test-with-security, groovy.lang.Closure) BenchmarkTestWithEndpoint_Jenkinsfile.script(groovy.lang.Closure) - BenchmarkTestWithEndpoint_Jenkinsfile.runBenchmarkTestScript({endpoint=opensearch-ABCxdfdfhyfk.com, insecure=false, workload=nyc_taxis, userTag=true,security-enabled:true, workloadParams=, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=, telemetryParams=}) + BenchmarkTestWithEndpoint_Jenkinsfile.runBenchmarkTestScript({command=execute-test, endpoint=opensearch-ABCxdfdfhyfk.com, insecure=false, workload=nyc_taxis, userTag=true,security-enabled:true, workloadParams=, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@6.7.2, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -16,4 +16,4 @@ 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(set +x && ./test.sh benchmark-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag true,security-enabled:true) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag true,security-enabled:true) diff --git a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile index e36711039..d0ce58387 100644 --- a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile +++ b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile @@ -18,7 +18,8 @@ pipeline { url: BUNDLE_MANIFEST_URL, path: BUNDLE_MANIFEST ) - runBenchmarkTestScript(bundleManifest: BUNDLE_MANIFEST, + runBenchmarkTestScript(command: COMMAND, + bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, workload: TEST_WORKLOAD, @@ -57,7 +58,8 @@ pipeline { url: BUNDLE_MANIFEST_URL, path: BUNDLE_MANIFEST ) - runBenchmarkTestScript(bundleManifest: BUNDLE_MANIFEST, + runBenchmarkTestScript(command: COMMAND, + bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, workload: TEST_WORKLOAD, diff --git a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt index ffe2429bf..6cbb660cd 100644 --- a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt @@ -11,7 +11,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@6.7.2, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -30,7 +30,7 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) BenchmarkTest_Jenkinsfile.stage(test-without-security, groovy.lang.Closure) BenchmarkTest_Jenkinsfile.script(groovy.lang.Closure) BenchmarkTest_Jenkinsfile.downloadBuildManifest({url=test://artifact.url, path=tests/data/opensearch-1.3.0-bundle.yml}) @@ -41,7 +41,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@6.7.2, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -60,4 +60,4 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) diff --git a/tests/jenkins/lib-testers/RunBenchmarkTestEndpointLibTest.groovy b/tests/jenkins/lib-testers/RunBenchmarkTestEndpointLibTest.groovy index 5bb231ed3..830366599 100644 --- a/tests/jenkins/lib-testers/RunBenchmarkTestEndpointLibTest.groovy +++ b/tests/jenkins/lib-testers/RunBenchmarkTestEndpointLibTest.groovy @@ -11,6 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat class RunBenchmarkTestEndpointLibTester extends LibFunctionTester{ + private String command private String endpoint private String insecure private String workload @@ -22,9 +23,10 @@ class RunBenchmarkTestEndpointLibTester extends LibFunctionTester{ private String additionalConfig private String telemetryParams - public RunBenchmarkTestEndpointLibTester(endpoint, insecure, workload, userTag, workloadParams, + public RunBenchmarkTestEndpointLibTester(command, endpoint, insecure, workload, userTag, workloadParams, testProcedure, excludeTasks, includeTasks, additionalConfig,telemetryParams){ + this.command = command this.endpoint = endpoint this.insecure = insecure this.workload = workload @@ -81,6 +83,7 @@ class RunBenchmarkTestEndpointLibTester extends LibFunctionTester{ binding.setVariable('env', ['BUILD_NUMBER': '307']) binding.setVariable('BUILD_NUMBER', '307') binding.setVariable('BUILD_URL', 'test://artifact.url') + binding.setVariable('COMMAND', command) binding.setVariable('CLUSTER_ENDPOINT', endpoint) binding.setVariable('GITHUB_BOT_TOKEN_NAME', 'bot_token_name') binding.setVariable('GITHUB_USER', 'test_user') diff --git a/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy b/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy index f2fc69625..4660a6cc6 100644 --- a/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy +++ b/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy @@ -11,6 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat class RunBenchmarkTestScriptLibTester extends LibFunctionTester{ + private String command private String bundleManifest private String distributionUrl private String distributionVersion @@ -40,10 +41,11 @@ class RunBenchmarkTestScriptLibTester extends LibFunctionTester{ private String captureSegmentReplicationStat private String telemetryParams - public RunBenchmarkTestScriptLibTester(bundleManifest, distributionUrl, distributionVersion, insecure, workload, singleNode, minDistribution, use50PercentHeap, + public RunBenchmarkTestScriptLibTester(command, bundleManifest, distributionUrl, distributionVersion, insecure, workload, singleNode, minDistribution, use50PercentHeap, enableRemoteStore, managerNodeCount, dataNodeCount, dataInstanceType, userTag, workloadParams, testProcedure, excludeTasks, includeTasks, additionalConfig, captureNodeStat, captureSegmentReplicationStat, telemetryParams){ + this.command = command this.bundleManifest = bundleManifest this.distributionUrl = distributionUrl this.distributionVersion = distributionVersion @@ -124,6 +126,7 @@ class RunBenchmarkTestScriptLibTester extends LibFunctionTester{ binding.setVariable('env', ['BUILD_NUMBER': '307']) binding.setVariable('BUILD_NUMBER', '307') binding.setVariable('BUILD_URL', 'test://artifact.url') + binding.setVariable('COMMAND', command) binding.setVariable('BUNDLE_MANIFEST', bundleManifest) binding.setVariable('DISTRIBUTION_URL', distributionUrl) binding.setVariable('DISTRIBUTION_VERSION', distributionVersion) diff --git a/vars/runBenchmarkTestScript.groovy b/vars/runBenchmarkTestScript.groovy index 201ca75e3..706fb2def 100644 --- a/vars/runBenchmarkTestScript.groovy +++ b/vars/runBenchmarkTestScript.groovy @@ -74,6 +74,7 @@ void call(Map args = [:]) { def command = [ './test.sh', 'benchmark-test', + args.command, isNullOrEmpty(args.bundleManifest) ? "" : "--bundle-manifest ${args.bundleManifest}", isNullOrEmpty(args.distributionUrl) ? "" : "--distribution-url ${args.distributionUrl}", isNullOrEmpty(args.distributionVersion) ? "" : "--distribution-version ${args.distributionVersion}",