From f0eeaff63f078d226065e75082d7108850a64c79 Mon Sep 17 00:00:00 2001 From: Rishabh Singh Date: Fri, 9 Aug 2024 09:36:20 -0700 Subject: [PATCH] Fix datastore endpoint secret name (#481) Signed-off-by: Rishabh Singh --- build.gradle | 2 +- tests/jenkins/jobs/CompareBenchmarkRun_Jenkinsfile.txt | 2 +- vars/getCompareBenchmarkIds.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 5f595b28..4ba5981b 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ jacocoTestReport { } } -String version = '6.8.1' +String version = '6.8.2' task updateVersion { doLast { diff --git a/tests/jenkins/jobs/CompareBenchmarkRun_Jenkinsfile.txt b/tests/jenkins/jobs/CompareBenchmarkRun_Jenkinsfile.txt index 6507bd34..48706ac8 100644 --- a/tests/jenkins/jobs/CompareBenchmarkRun_Jenkinsfile.txt +++ b/tests/jenkins/jobs/CompareBenchmarkRun_Jenkinsfile.txt @@ -53,7 +53,7 @@ getCompareBenchmarkIds.echo(Latest test-execution-id: test-id) getCompareBenchmarkIds.string({credentialsId=benchmark-metrics-datastore-user, variable=DATASTORE_USER}) getCompareBenchmarkIds.string({credentialsId=benchmark-metrics-datastore-password, variable=DATASTORE_PASSWORD}) - getCompareBenchmarkIds.string({credentialsId=benchmark-metrics-datastore-endpoint, variable=DATASTORE_ENDPOINT}) + getCompareBenchmarkIds.string({credentialsId=benchmark-metrics-datastore-nlb-endpoint, variable=DATASTORE_ENDPOINT}) getCompareBenchmarkIds.withCredentials([DATASTORE_USER, DATASTORE_PASSWORD, DATASTORE_ENDPOINT], groovy.lang.Closure) getCompareBenchmarkIds.sh({script= curl -X POST "https://DATASTORE_ENDPOINT/benchmark-results-*/_search" -ku DATASTORE_USER:DATASTORE_PASSWORD -H 'Content-Type: application/json' -d '{ diff --git a/vars/getCompareBenchmarkIds.groovy b/vars/getCompareBenchmarkIds.groovy index 0283ce50..9dae5745 100644 --- a/vars/getCompareBenchmarkIds.groovy +++ b/vars/getCompareBenchmarkIds.groovy @@ -84,7 +84,7 @@ String getBaselineTestExecutionId(baselineClusterConfig, distributionVersion, wo String getContenderTestExecutionId(pullRequestNumber) { withCredentials([string(credentialsId: 'benchmark-metrics-datastore-user', variable: 'DATASTORE_USER'), string(credentialsId: 'benchmark-metrics-datastore-password', variable: 'DATASTORE_PASSWORD'), - string(credentialsId: 'benchmark-metrics-datastore-endpoint', variable: 'DATASTORE_ENDPOINT')]) { + string(credentialsId: 'benchmark-metrics-datastore-nlb-endpoint', variable: 'DATASTORE_ENDPOINT')]) { def curlCommand = """ curl -X POST "https://${DATASTORE_ENDPOINT}/benchmark-results-*/_search" -ku ${DATASTORE_USER}:${DATASTORE_PASSWORD} -H 'Content-Type: application/json' -d '{ "size": 1,