-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support to run ad-hoc benchmark using distribution url (#326)
Signed-off-by: Rishabh Singh <[email protected]> (cherry picked from commit 9704cbe)
- Loading branch information
1 parent
d5d12fb
commit 6d4da55
Showing
12 changed files
with
273 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| import jenkins.tests.BuildPipelineTest | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
|
|
||
| import static com.lesfurets.jenkins.unit.MethodCall.callArgsToString | ||
| import static org.hamcrest.CoreMatchers.equalTo | ||
| import static org.hamcrest.CoreMatchers.hasItem | ||
| import static org.hamcrest.MatcherAssert.assertThat | ||
|
|
||
| class TestRunBenchmarkTestScriptNoManifest extends BuildPipelineTest { | ||
|
|
||
| @Before | ||
| void setUp() { | ||
| this.registerLibTester(new RunBenchmarkTestScriptLibTester( | ||
| '', | ||
| 'https://www.exmaple.com/example.tar.gz', | ||
| '3.0.0', | ||
| 'true', | ||
| 'nyc_taxis', | ||
| 'true', | ||
| 'false', | ||
| 'true', | ||
| 'false', | ||
| '', | ||
| '', | ||
| 'r5.8xlarge', | ||
| '', | ||
| '', | ||
| 'cluster.indices.replication.strategy:SEGMENT', | ||
| 'false', | ||
| 'true', | ||
| '' | ||
| )) | ||
| super.setUp() | ||
| } | ||
|
|
||
| @Test | ||
| public void testRunBenchmarkTestScript_PipelineSingleNode() { | ||
| super.testPipeline("tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile") | ||
| } | ||
|
|
||
| @Test | ||
| void testRunBenchmarkTestScript_verifyScriptExecutionsNoManifest() { | ||
| runScript("tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile") | ||
|
|
||
| def testScriptCommands = getCommandExecutions('sh', './test.sh').findAll { | ||
| shCommand -> shCommand.contains('./test.sh') | ||
| } | ||
|
|
||
| assertThat(testScriptCommands.size(), equalTo(2)) | ||
| assertThat(testScriptCommands, hasItem( | ||
| "./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 --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 ".toString() | ||
| )) | ||
| assertThat(testScriptCommands, hasItem( | ||
| "./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 --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 ".toString() | ||
| )) | ||
| } | ||
|
|
||
| def getCommandExecutions(methodName, command) { | ||
| def shCommands = helper.callStack.findAll { | ||
| call -> | ||
| call.methodName == methodName | ||
| }. | ||
| collect { | ||
| call -> | ||
| callArgsToString(call) | ||
| }.findAll { | ||
| shCommand -> | ||
| shCommand.contains(command) | ||
| } | ||
|
|
||
| return shCommands | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| downloadBuildManifest.sh(curl -sSL 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, 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"}, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) | ||
| 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"}, 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({[email protected], retriever=null}) | ||
| runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) | ||
|
|
@@ -28,7 +28,7 @@ | |
| BuildManifest.getArtifactBuildId() | ||
| BuildManifest.getArtifactArchitecture() | ||
| BuildManifest.getCommitId(OpenSearch) | ||
| runBenchmarkTestScript.sh(./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"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') | ||
| runBenchmarkTestScript.sh(./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"}' --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}) | ||
|
|
@@ -37,7 +37,7 @@ | |
| downloadBuildManifest.sh(curl -sSL 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, 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"}, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) | ||
| 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"}, 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({[email protected], retriever=null}) | ||
| runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) | ||
|
|
@@ -56,4 +56,4 @@ | |
| BuildManifest.getArtifactBuildId() | ||
| BuildManifest.getArtifactArchitecture() | ||
| BuildManifest.getCommitId(OpenSearch) | ||
| runBenchmarkTestScript.sh(./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"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') | ||
| runBenchmarkTestScript.sh(./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"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') | ||
Oops, something went wrong.