From be40363ec6f02c85215ab3864ce07a909c9b5049 Mon Sep 17 00:00:00 2001 From: Michael Oviedo Date: Tue, 6 Aug 2024 14:49:37 -0700 Subject: [PATCH] update jenkins jobs (#4922) Signed-off-by: Michael Oviedo --- .../benchmark-pull-request.jenkinsfile | 3 +- .../benchmark-test-endpoint.jenkinsfile | 3 +- jenkins/opensearch/benchmark-test.jenkinsfile | 4 ++- tests/jenkins/TestBenchmarkPullRequest.groovy | 4 +-- .../TestRunBenchmarkTestEndpoint.groovy | 6 ++-- ...nBenchmarkTestScriptDistributionUrl.groovy | 4 +-- .../TestRunNonSecBenchmarkTestScript.groovy | 6 ++-- .../TestRunSecureBenchmarkTestScript.groovy | 8 ++--- ...hmark-pull-request-generic.jenkinsfile.txt | 8 ++--- ...enchmark-pull-request-user.jenkinsfile.txt | 8 ++--- ...mark-test-distribution-url.jenkinsfile.txt | 8 ++--- ...ark-test-endpoint-insecure.jenkinsfile.txt | 8 ++--- ...hmark-test-endpoint-secure.jenkinsfile.txt | 8 ++--- .../opensearch/benchmark-test.jenkinsfile.txt | 20 +++++++----- .../secure-benchmark-test.jenkinsfile.txt | 32 +++++++++++-------- 15 files changed, 72 insertions(+), 58 deletions(-) diff --git a/jenkins/opensearch/benchmark-pull-request.jenkinsfile b/jenkins/opensearch/benchmark-pull-request.jenkinsfile index a22829afa1..0872e61b02 100644 --- a/jenkins/opensearch/benchmark-pull-request.jenkinsfile +++ b/jenkins/opensearch/benchmark-pull-request.jenkinsfile @@ -7,7 +7,7 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@6.4.3', retriever: modernSCM([ +lib = library(identifier: 'jenkins@6.8.0', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', @@ -235,6 +235,7 @@ pipeline { echo "security-enabled: ${SECURITY_ENABLED}" runBenchmarkTestScript( + command: 'execute-test', distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, workload: TEST_WORKLOAD, diff --git a/jenkins/opensearch/benchmark-test-endpoint.jenkinsfile b/jenkins/opensearch/benchmark-test-endpoint.jenkinsfile index 9631f0acda..368dcdd51f 100644 --- a/jenkins/opensearch/benchmark-test-endpoint.jenkinsfile +++ b/jenkins/opensearch/benchmark-test-endpoint.jenkinsfile @@ -7,7 +7,7 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@6.4.3', retriever: modernSCM([ +lib = library(identifier: 'jenkins@6.8.0', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', @@ -115,6 +115,7 @@ parameters { echo "security-enabled: ${SECURITY_ENABLED}" runBenchmarkTestScript( + command: 'execute-test', endpoint: CLUSTER_ENDPOINT, insecure: !(params.SECURITY_ENABLED), username: USERNAME, diff --git a/jenkins/opensearch/benchmark-test.jenkinsfile b/jenkins/opensearch/benchmark-test.jenkinsfile index 5d86d7b328..c4e93ac353 100644 --- a/jenkins/opensearch/benchmark-test.jenkinsfile +++ b/jenkins/opensearch/benchmark-test.jenkinsfile @@ -7,7 +7,7 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@6.4.1', retriever: modernSCM([ +lib = library(identifier: 'jenkins@6.8.0', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', @@ -360,6 +360,7 @@ pipeline { } runBenchmarkTestScript( + command: 'execute-test', bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, @@ -419,6 +420,7 @@ pipeline { } runBenchmarkTestScript( + command: 'execute-test', bundleManifest: BUNDLE_MANIFEST, distributionUrl: DISTRIBUTION_URL, distributionVersion: DISTRIBUTION_VERSION, diff --git a/tests/jenkins/TestBenchmarkPullRequest.groovy b/tests/jenkins/TestBenchmarkPullRequest.groovy index 9fd6bbb874..91b71c05c6 100644 --- a/tests/jenkins/TestBenchmarkPullRequest.groovy +++ b/tests/jenkins/TestBenchmarkPullRequest.groovy @@ -28,7 +28,7 @@ class TestBenchmarkPullRequest extends BuildPipelineTest { helper.registerSharedLibrary( library().name('jenkins') - .defaultVersion('6.6.0') + .defaultVersion('6.8.0') .allowOverride(true) .implicit(true) .targetPath('vars') @@ -139,7 +139,7 @@ class TestBenchmarkPullRequest extends BuildPipelineTest { } assertThat(testScriptCommands.size(), equalTo(1)) assertThat(testScriptCommands, hasItems( - "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 --without-security --single-node --min-distribution --use-50-percent-heap --suffix 307 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100".toString() + "set +x && ./test.sh benchmark-test execute-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 --without-security --single-node --min-distribution --use-50-percent-heap --suffix 307 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100".toString() )) def testGhCliCommand = getCommandExecutions('sh', 'gh').findAll { diff --git a/tests/jenkins/TestRunBenchmarkTestEndpoint.groovy b/tests/jenkins/TestRunBenchmarkTestEndpoint.groovy index 52271c41a0..c672a899fb 100644 --- a/tests/jenkins/TestRunBenchmarkTestEndpoint.groovy +++ b/tests/jenkins/TestRunBenchmarkTestEndpoint.groovy @@ -26,7 +26,7 @@ class TestRunBenchmarkTestEndpoint extends BuildPipelineTest{ void setUp() { helper.registerSharedLibrary( library().name('jenkins') - .defaultVersion('6.4.3') + .defaultVersion('6.8.0') .allowOverride(true) .implicit(true) .targetPath('vars') @@ -111,7 +111,7 @@ class TestRunBenchmarkTestEndpoint extends BuildPipelineTest{ assertThat(testScriptCommands.size(), equalTo(1)) assertThat(testScriptCommands, hasItems( - "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 --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'" + "set +x && ./test.sh benchmark-test execute-test --cluster-endpoint opensearch-ABCxdfdfhyfk.com --workload nyc-taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag run-type:test,security-enabled:true --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'" )) } @Test @@ -132,7 +132,7 @@ class TestRunBenchmarkTestEndpoint extends BuildPipelineTest{ assertThat(testScriptCommands.size(), equalTo(1)) assertThat(testScriptCommands, hasItems( - "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 --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'" + "set +x && ./test.sh benchmark-test execute-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 --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{\"telemetry_setting\":\"value\"}'" )) } diff --git a/tests/jenkins/TestRunBenchmarkTestScriptDistributionUrl.groovy b/tests/jenkins/TestRunBenchmarkTestScriptDistributionUrl.groovy index c857cda436..6673737a9d 100644 --- a/tests/jenkins/TestRunBenchmarkTestScriptDistributionUrl.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScriptDistributionUrl.groovy @@ -26,7 +26,7 @@ class TestRunBenchmarkTestScriptDistributionUrl extends BuildPipelineTest { void setUp() { helper.registerSharedLibrary( library().name('jenkins') - .defaultVersion('6.4.1') + .defaultVersion('6.8.0') .allowOverride(true) .implicit(true) .targetPath('vars') @@ -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 execute-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 index 8d63f62e9a..91ea2e70ba 100644 --- a/tests/jenkins/TestRunNonSecBenchmarkTestScript.groovy +++ b/tests/jenkins/TestRunNonSecBenchmarkTestScript.groovy @@ -26,7 +26,7 @@ class TestRunNonSecBenchmarkTestScript extends BuildPipelineTest{ void setUp() { helper.registerSharedLibrary( library().name('jenkins') - .defaultVersion('6.4.1') + .defaultVersion('6.8.0') .allowOverride(true) .implicit(true) .targetPath('vars') @@ -116,7 +116,7 @@ class TestRunNonSecBenchmarkTestScript extends BuildPipelineTest{ assertThat(curlCommands.size(), equalTo(3)) assertThat(curlCommands, hasItem( - "curl -sSL test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml".toString() + "curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml".toString() )) def s3DownloadCommands = getCommandExecutions('s3Download', 'bucket').findAll { @@ -140,7 +140,7 @@ class TestRunNonSecBenchmarkTestScript extends BuildPipelineTest{ assertThat(testScriptCommands.size(), equalTo(1)) assertThat(testScriptCommands, hasItem( - "./test.sh benchmark-test --bundle-manifest tests/jenkins/data/opensearch-1.3.0-non-security-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,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 --exclude-tasks type:search,scroll --include-tasks type:search,scroll --data-node-storage 100".toString() + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/jenkins/data/opensearch-1.3.0-non-security-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,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 --exclude-tasks type:search,scroll --include-tasks type:search,scroll --data-node-storage 100".toString() )) } diff --git a/tests/jenkins/TestRunSecureBenchmarkTestScript.groovy b/tests/jenkins/TestRunSecureBenchmarkTestScript.groovy index 388ee400aa..b5d13d174c 100644 --- a/tests/jenkins/TestRunSecureBenchmarkTestScript.groovy +++ b/tests/jenkins/TestRunSecureBenchmarkTestScript.groovy @@ -26,7 +26,7 @@ class TestRunSecureBenchmarkTestScript extends BuildPipelineTest{ void setUp() { helper.registerSharedLibrary( library().name('jenkins') - .defaultVersion('6.4.1') + .defaultVersion('6.8.0') .allowOverride(true) .implicit(true) .targetPath('vars') @@ -116,7 +116,7 @@ class TestRunSecureBenchmarkTestScript extends BuildPipelineTest{ assertThat(curlCommands.size(), equalTo(4)) assertThat(curlCommands, hasItem( - "curl -sSL test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml".toString() + "curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml".toString() )) def s3DownloadCommands = getCommandExecutions('s3Download', 'bucket').findAll { @@ -141,8 +141,8 @@ class TestRunSecureBenchmarkTestScript extends BuildPipelineTest{ assertThat(testScriptCommands.size(), equalTo(2)) assertThat(testScriptCommands, hasItems( - "./test.sh benchmark-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:true,jenkins-build-id:307 --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString(), - "./test.sh benchmark-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:false,jenkins-build-id:307 --without-security --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:true,jenkins-build-id:307 --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString(), + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:false,jenkins-build-id:307 --without-security --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() )) } diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-generic.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-generic.jenkinsfile.txt index 80efb53e50..cdf3f311ba 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-generic.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-generic.jenkinsfile.txt @@ -1,6 +1,6 @@ benchmark-pull-request.run() benchmark-pull-request.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git}) - benchmark-pull-request.library({identifier=jenkins@6.4.3, retriever=null}) + benchmark-pull-request.library({identifier=jenkins@6.8.0, retriever=null}) benchmark-pull-request.pipeline(groovy.lang.Closure) benchmark-pull-request.timeout({time=24, unit=HOURS}) benchmark-pull-request.logRotator({daysToKeepStr=30}) @@ -36,9 +36,9 @@ benchmark-pull-request.stage(benchmark-pull-request, groovy.lang.Closure) benchmark-pull-request.script(groovy.lang.Closure) benchmark-pull-request.echo(security-enabled: false) - benchmark-pull-request.runBenchmarkTestScript({distributionUrl=https://artifacts.com/artifact.tar.gz, distributionVersion=3.0.0, workload=nyc-taxis, insecure=true, singleNode=true, minDistribution=true, use50PercentHeap=true, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, userTag=run-type:test,security-enabled:false, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, telemetryParams=}) + benchmark-pull-request.runBenchmarkTestScript({command=execute-test, distributionUrl=https://artifacts.com/artifact.tar.gz, distributionVersion=3.0.0, workload=nyc-taxis, insecure=true, singleNode=true, minDistribution=true, use50PercentHeap=true, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, userTag=run-type:test,security-enabled:false, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.6.0, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) runBenchmarkTestScript.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) runBenchmarkTestScript.withCredentials([AWS_ACCOUNT_PUBLIC, ARTIFACT_BUCKET_NAME], groovy.lang.Closure) @@ -50,7 +50,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(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 --without-security --single-node --min-distribution --use-50-percent-heap --suffix 307 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-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 --without-security --single-node --min-distribution --use-50-percent-heap --suffix 307 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100) benchmark-pull-request.sh(cp /tmp/final_result_307.md final_result_307.md) benchmark-pull-request.sh( echo '
Benchmark Results' > temp_result_307.md diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-user.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-user.jenkinsfile.txt index 927fb2d66c..a4ee5de678 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-user.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-pull-request-user.jenkinsfile.txt @@ -1,6 +1,6 @@ benchmark-pull-request.run() benchmark-pull-request.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git}) - benchmark-pull-request.library({identifier=jenkins@6.4.3, retriever=null}) + benchmark-pull-request.library({identifier=jenkins@6.8.0, retriever=null}) benchmark-pull-request.pipeline(groovy.lang.Closure) benchmark-pull-request.timeout({time=24, unit=HOURS}) benchmark-pull-request.logRotator({daysToKeepStr=30}) @@ -36,9 +36,9 @@ benchmark-pull-request.stage(benchmark-pull-request, groovy.lang.Closure) benchmark-pull-request.script(groovy.lang.Closure) benchmark-pull-request.echo(security-enabled: false) - benchmark-pull-request.runBenchmarkTestScript({distributionUrl=https://artifacts.com/artifact.tar.gz, distributionVersion=3.0.0, workload=nyc-taxis, insecure=true, singleNode=true, minDistribution=true, use50PercentHeap=true, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, userTag=run-type:test,security-enabled:false, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, telemetryParams=}) + benchmark-pull-request.runBenchmarkTestScript({command=execute-test, distributionUrl=https://artifacts.com/artifact.tar.gz, distributionVersion=3.0.0, workload=nyc-taxis, insecure=true, singleNode=true, minDistribution=true, use50PercentHeap=true, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, userTag=run-type:test,security-enabled:false, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.6.0, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) runBenchmarkTestScript.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) runBenchmarkTestScript.withCredentials([AWS_ACCOUNT_PUBLIC, ARTIFACT_BUCKET_NAME], groovy.lang.Closure) @@ -50,7 +50,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(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 --without-security --single-node --min-distribution --use-50-percent-heap --suffix 307 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-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 --without-security --single-node --min-distribution --use-50-percent-heap --suffix 307 --data-instance-type r5-4xlarge --test-procedure append-no-conflicts --data-node-storage 100) benchmark-pull-request.sh(cp /tmp/final_result_307.md final_result_307.md) benchmark-pull-request.sh( echo '
Benchmark Results' > temp_result_307.md 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 index e8bca191ed..946098ee25 100644 --- 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 @@ -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@6.4.1, retriever=null}) + benchmark-test.library({identifier=jenkins@6.8.0, retriever=null}) benchmark-test.pipeline(groovy.lang.Closure) benchmark-test.timeout({time=24, unit=HOURS}) benchmark-test.logRotator({daysToKeepStr=30}) @@ -151,9 +151,9 @@ benchmark-test.script(groovy.lang.Closure) benchmark-test.echo(DISTRIBUTION_URL: https://artifacts.com/artifact.tar.gz) benchmark-test.echo(DISTRIBUTION_VERSION: 3.0.0) - benchmark-test.runBenchmarkTestScript({bundleManifest=, distributionUrl=https://artifacts.com/artifact.tar.gz, distributionVersion=3.0.0, workload=nyc-taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, userTag=run-type:test,security-enabled:false,jenkins-build-id:307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams=}) + benchmark-test.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://artifacts.com/artifact.tar.gz, distributionVersion=3.0.0, workload=nyc-taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, userTag=run-type:test,security-enabled:false,jenkins-build-id:307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.4.1, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) runBenchmarkTestScript.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) runBenchmarkTestScript.withCredentials([AWS_ACCOUNT_PUBLIC, ARTIFACT_BUCKET_NAME], groovy.lang.Closure) @@ -165,7 +165,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 execute-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 index 79874e3899..7c6fd75fc4 100644 --- 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 @@ -1,6 +1,6 @@ benchmark-test-endpoint.run() benchmark-test-endpoint.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git}) - benchmark-test-endpoint.library({identifier=jenkins@6.4.3, retriever=null}) + benchmark-test-endpoint.library({identifier=jenkins@6.8.0, retriever=null}) benchmark-test-endpoint.pipeline(groovy.lang.Closure) benchmark-test-endpoint.timeout({time=24, unit=HOURS}) benchmark-test-endpoint.logRotator({daysToKeepStr=30}) @@ -15,9 +15,9 @@ benchmark-test-endpoint.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]) benchmark-test-endpoint.script(groovy.lang.Closure) benchmark-test-endpoint.echo(security-enabled: true) - benchmark-test-endpoint.runBenchmarkTestScript({endpoint=opensearch-ABCxdfdfhyfk.com, insecure=false, username=, password=, workload=nyc-taxis, userTag=run-type:test,security-enabled:true, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) + benchmark-test-endpoint.runBenchmarkTestScript({command=execute-test, endpoint=opensearch-ABCxdfdfhyfk.com, insecure=false, username=, password=, workload=nyc-taxis, userTag=run-type:test,security-enabled:true, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.4.3, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) runBenchmarkTestScript.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) runBenchmarkTestScript.withCredentials([AWS_ACCOUNT_PUBLIC, ARTIFACT_BUCKET_NAME], groovy.lang.Closure) @@ -28,7 +28,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(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 --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{"telemetry_setting":"value"}') + 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 run-type:test,security-enabled:true --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{"telemetry_setting":"value"}') benchmark-test-endpoint.stash({includes=test_execution*.csv, name=benchmark}) benchmark-test-endpoint.unstash(benchmark) benchmark-test-endpoint.archiveArtifacts({artifacts=test_execution*.csv}) 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 index 79874e3899..7c6fd75fc4 100644 --- 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 @@ -1,6 +1,6 @@ benchmark-test-endpoint.run() benchmark-test-endpoint.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git}) - benchmark-test-endpoint.library({identifier=jenkins@6.4.3, retriever=null}) + benchmark-test-endpoint.library({identifier=jenkins@6.8.0, retriever=null}) benchmark-test-endpoint.pipeline(groovy.lang.Closure) benchmark-test-endpoint.timeout({time=24, unit=HOURS}) benchmark-test-endpoint.logRotator({daysToKeepStr=30}) @@ -15,9 +15,9 @@ benchmark-test-endpoint.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]) benchmark-test-endpoint.script(groovy.lang.Closure) benchmark-test-endpoint.echo(security-enabled: true) - benchmark-test-endpoint.runBenchmarkTestScript({endpoint=opensearch-ABCxdfdfhyfk.com, insecure=false, username=, password=, workload=nyc-taxis, userTag=run-type:test,security-enabled:true, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) + benchmark-test-endpoint.runBenchmarkTestScript({command=execute-test, endpoint=opensearch-ABCxdfdfhyfk.com, insecure=false, username=, password=, workload=nyc-taxis, userTag=run-type:test,security-enabled:true, suffix=307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=, includeTasks=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.4.3, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) runBenchmarkTestScript.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) runBenchmarkTestScript.withCredentials([AWS_ACCOUNT_PUBLIC, ARTIFACT_BUCKET_NAME], groovy.lang.Closure) @@ -28,7 +28,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(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 --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{"telemetry_setting":"value"}') + 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 run-type:test,security-enabled:true --suffix 307 --test-procedure append-no-conflicts --telemetry-params '{"telemetry_setting":"value"}') benchmark-test-endpoint.stash({includes=test_execution*.csv, name=benchmark}) benchmark-test-endpoint.unstash(benchmark) benchmark-test-endpoint.archiveArtifacts({artifacts=test_execution*.csv}) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt index a6ce2800f4..0d058a6a85 100644 --- 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@6.4.1, retriever=null}) + benchmark-test.library({identifier=jenkins@6.8.0, retriever=null}) benchmark-test.pipeline(groovy.lang.Closure) benchmark-test.timeout({time=24, unit=HOURS}) benchmark-test.logRotator({daysToKeepStr=30}) @@ -140,8 +140,10 @@ benchmark-test.script(groovy.lang.Closure) benchmark-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@6.4.1, retriever=null}) - downloadBuildManifest.sh(curl -sSL test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml) + downloadBuildManifest.library({identifier=jenkins@6.8.0, retriever=null}) + downloadBuildManifest.sh(mkdir -p $(dirname "tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml")) + downloadBuildManifest.sh(touch tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml) + downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml) downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml}) BuildManifest.asBoolean() BuildManifest.getArtifactBuildId() @@ -159,16 +161,18 @@ benchmark-test.script(groovy.lang.Closure) benchmark-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@6.4.1, retriever=null}) - downloadBuildManifest.sh(curl -sSL test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml) + downloadBuildManifest.library({identifier=jenkins@6.8.0, retriever=null}) + downloadBuildManifest.sh(mkdir -p $(dirname "tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml")) + downloadBuildManifest.sh(touch tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml) + downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml) downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml}) BuildManifest.asBoolean() benchmark-test.echo(BUNDLE_MANIFEST: tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml) benchmark-test.echo(BUILD_ID: 1234) benchmark-test.echo(Architecture: x64) - benchmark-test.runBenchmarkTestScript({bundleManifest=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc-taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, userTag=run-type:test,security-enabled:false,jenkins-build-id:307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=type:search,scroll, includeTasks=type:search,scroll, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams=}) + benchmark-test.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc-taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5-4xlarge, userTag=run-type:test,security-enabled:false,jenkins-build-id:307, workloadParams=, testProcedure=append-no-conflicts, excludeTasks=type:search,scroll, includeTasks=type:search,scroll, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=false, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.4.1, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml}) BuildManifest.asBoolean() runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -185,7 +189,7 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(./test.sh benchmark-test --bundle-manifest tests/jenkins/data/opensearch-1.3.0-non-security-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,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 --exclude-tasks type:search,scroll --include-tasks type:search,scroll --data-node-storage 100) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/jenkins/data/opensearch-1.3.0-non-security-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,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 --exclude-tasks type:search,scroll --include-tasks type:search,scroll --data-node-storage 100) Messages.asBoolean() Messages.asBoolean() Messages.get([benchmark-test]) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt index 6a622d49ff..278b871ad9 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-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@6.4.1, retriever=null}) + benchmark-test.library({identifier=jenkins@6.8.0, retriever=null}) benchmark-test.pipeline(groovy.lang.Closure) benchmark-test.timeout({time=24, unit=HOURS}) benchmark-test.logRotator({daysToKeepStr=30}) @@ -140,8 +140,10 @@ benchmark-test.script(groovy.lang.Closure) benchmark-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@6.4.1, retriever=null}) - downloadBuildManifest.sh(curl -sSL test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml) + downloadBuildManifest.library({identifier=jenkins@6.8.0, retriever=null}) + downloadBuildManifest.sh(mkdir -p $(dirname "tests/jenkins/data/opensearch-1.3.0-bundle.yml")) + downloadBuildManifest.sh(touch tests/jenkins/data/opensearch-1.3.0-bundle.yml) + downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() BuildManifest.getArtifactBuildId() @@ -158,16 +160,18 @@ benchmark-test.script(groovy.lang.Closure) benchmark-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@6.4.1, retriever=null}) - downloadBuildManifest.sh(curl -sSL test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml) + downloadBuildManifest.library({identifier=jenkins@6.8.0, retriever=null}) + downloadBuildManifest.sh(mkdir -p $(dirname "tests/jenkins/data/opensearch-1.3.0-bundle.yml")) + downloadBuildManifest.sh(touch tests/jenkins/data/opensearch-1.3.0-bundle.yml) + downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() benchmark-test.echo(BUNDLE_MANIFEST: tests/jenkins/data/opensearch-1.3.0-bundle.yml) benchmark-test.echo(BUILD_ID: 1234) benchmark-test.echo(Architecture: x64) - benchmark-test.runBenchmarkTestScript({bundleManifest=tests/jenkins/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=run-type:test,security-enabled:true,jenkins-build-id:307, workloadParams=, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams={"telemetry_setting":"value"}}) + benchmark-test.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/jenkins/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=run-type:test,security-enabled:true,jenkins-build-id:307, workloadParams=, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.4.1, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -184,7 +188,7 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(./test.sh benchmark-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:true,jenkins-build-id:307 --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{"telemetry_setting":"value"}') + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:true,jenkins-build-id:307 --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{"telemetry_setting":"value"}') Messages.asBoolean() Messages.asBoolean() Messages.get([benchmark-test]) @@ -204,16 +208,18 @@ Benchmark tests with security for 1234 completed}) benchmark-test.script(groovy.lang.Closure) benchmark-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@6.4.1, retriever=null}) - downloadBuildManifest.sh(curl -sSL test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml) + downloadBuildManifest.library({identifier=jenkins@6.8.0, retriever=null}) + downloadBuildManifest.sh(mkdir -p $(dirname "tests/jenkins/data/opensearch-1.3.0-bundle.yml")) + downloadBuildManifest.sh(touch tests/jenkins/data/opensearch-1.3.0-bundle.yml) + downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/jenkins/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() benchmark-test.echo(BUNDLE_MANIFEST: tests/jenkins/data/opensearch-1.3.0-bundle.yml) benchmark-test.echo(BUILD_ID: 1234) benchmark-test.echo(Architecture: x64) - benchmark-test.runBenchmarkTestScript({bundleManifest=tests/jenkins/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=run-type:test,security-enabled:false,jenkins-build-id:307, workloadParams=, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams={"telemetry_setting":"value"}}) + benchmark-test.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/jenkins/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=run-type:test,security-enabled:false,jenkins-build-id:307, workloadParams=, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=, dataStorageSize=100, mlStorageSize=, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.4.1, retriever=null}) + runBenchmarkTestScript.library({identifier=jenkins@6.8.0, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -230,7 +236,7 @@ Benchmark tests with security for 1234 completed}) BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(./test.sh benchmark-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:false,jenkins-build-id:307 --without-security --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{"telemetry_setting":"value"}') + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/jenkins/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,run-type:test,security-enabled:false,jenkins-build-id:307 --without-security --use-50-percent-heap --enable-remote-store --capture-segment-replication-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --data-node-storage 100 --telemetry-params '{"telemetry_setting":"value"}') Messages.asBoolean() Messages.asBoolean() Messages.get([benchmark-test])