From 4ad61cbf2b174e256a25fbd8c2e0fd486052732d Mon Sep 17 00:00:00 2001 From: Michael Oviedo Date: Thu, 8 Aug 2024 13:32:25 -0700 Subject: [PATCH] add compare logic to opensearch build libraries (#478) Signed-off-by: Michael Oviedo (cherry picked from commit 6b367e57d6fe69b0e03f5ad989726660015e7685) --- .../jenkins/jobs/CompareTest_Jenkinsfile.txt | 39 ------------------- vars/runBenchmarkTestScript.groovy | 2 - 2 files changed, 41 deletions(-) delete mode 100644 tests/jenkins/jobs/CompareTest_Jenkinsfile.txt diff --git a/tests/jenkins/jobs/CompareTest_Jenkinsfile.txt b/tests/jenkins/jobs/CompareTest_Jenkinsfile.txt deleted file mode 100644 index 5d6088a6..00000000 --- a/tests/jenkins/jobs/CompareTest_Jenkinsfile.txt +++ /dev/null @@ -1,39 +0,0 @@ - CompareTest_Jenkinsfile.run() - CompareTest_Jenkinsfile.pipeline(groovy.lang.Closure) - CompareTest_Jenkinsfile.echo(Executing on agent [label:none]) - CompareTest_Jenkinsfile.stage(test-with-all-args, groovy.lang.Closure) - CompareTest_Jenkinsfile.script(groovy.lang.Closure) - CompareTest_Jenkinsfile.runBenchmarkTestScript({command=compare, baseline=12345, contender=54321, results_format=csv, results_numbers_align=left, results_file=/results/final_results, show_in_results=true, suffix=compare-tester, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml}) - runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.8.1, retriever=null}) - runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) - BuildManifest.asBoolean() - 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) - runBenchmarkTestScript.withAWS({role=opensearch-test, roleAccount=AWS_ACCOUNT_PUBLIC, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) - runBenchmarkTestScript.s3Download({file=benchmark.ini, bucket=ARTIFACT_BUCKET_NAME, path=test_config/benchmark.ini, force=true}) - runBenchmarkTestScript.string({credentialsId=benchmark-metrics-datastore-user, variable=DATASTORE_USER}) - runBenchmarkTestScript.string({credentialsId=benchmark-metrics-datastore-password, variable=DATASTORE_PASSWORD}) - 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 compare 12345 54321 --benchmark-config /tmp/workspace/benchmark.ini --suffix compare-tester --results-format=csv --results-numbers-align=left --results-file=/results/final_results --show-in-results=true) - CompareTest_Jenkinsfile.stage(test-with-base-args, groovy.lang.Closure) - CompareTest_Jenkinsfile.script(groovy.lang.Closure) - CompareTest_Jenkinsfile.runBenchmarkTestScript({command=compare, baseline=12345, contender=54321, suffix=compare-tester, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml}) - runBenchmarkTestScript.legacySCM(groovy.lang.Closure) - runBenchmarkTestScript.library({identifier=jenkins@6.8.1, retriever=null}) - runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) - BuildManifest.asBoolean() - 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) - runBenchmarkTestScript.withAWS({role=opensearch-test, roleAccount=AWS_ACCOUNT_PUBLIC, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) - runBenchmarkTestScript.s3Download({file=benchmark.ini, bucket=ARTIFACT_BUCKET_NAME, path=test_config/benchmark.ini, force=true}) - runBenchmarkTestScript.string({credentialsId=benchmark-metrics-datastore-user, variable=DATASTORE_USER}) - runBenchmarkTestScript.string({credentialsId=benchmark-metrics-datastore-password, variable=DATASTORE_PASSWORD}) - 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 compare 12345 54321 --benchmark-config /tmp/workspace/benchmark.ini --suffix compare-tester) diff --git a/vars/runBenchmarkTestScript.groovy b/vars/runBenchmarkTestScript.groovy index 5eefbbcb..23c022e6 100644 --- a/vars/runBenchmarkTestScript.groovy +++ b/vars/runBenchmarkTestScript.groovy @@ -47,8 +47,6 @@ * @param args.show_in_results - Determines whether or not to include the comparison in the results file. */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@6.8.0', retriever: legacySCM(scm)) - lib = library(identifier: 'jenkins@6.8.1', retriever: legacySCM(scm)) def buildManifest = null