From 6d6f8496bee191e82a2d167a3f70834d169ee5e6 Mon Sep 17 00:00:00 2001 From: Andy Kwok Date: Wed, 22 Jan 2025 16:23:04 -0800 Subject: [PATCH 1/4] Prometheus binary check Signed-off-by: Andy Kwok --- integ-test/build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/integ-test/build.gradle b/integ-test/build.gradle index d060e564f5..edb4fedca0 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -284,9 +284,14 @@ task startPrometheus(type: SpawnProcessTask) { mustRunAfter ':doctest:doctest' doFirst { - download.run { - src getPrometheusBinaryLocation() - dest new File("$projectDir/bin", 'prometheus.tar.gz') + File downloadedPrometheus = Paths.get("$projectDir/bin", 'prometheus.tar.gz').toFile() + if (!downloadedPrometheus.exists()) { + download.run { + src getPrometheusBinaryLocation() + dest new File("$projectDir/bin", 'prometheus.tar.gz') + } + } else { + println "Prometheus File Already Exists" } copy { from tarTree("$projectDir/bin/prometheus.tar.gz") From b3873c71b8002d7d76bb25c5199c56918ce35427 Mon Sep 17 00:00:00 2001 From: Andy Kwok Date: Wed, 22 Jan 2025 16:34:51 -0800 Subject: [PATCH 2/4] Update prometheus script Signed-off-by: Andy Kwok --- integ-test/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/integ-test/build.gradle b/integ-test/build.gradle index edb4fedca0..5de28f938d 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -311,7 +311,6 @@ task startPrometheus(type: SpawnProcessTask) { task stopPrometheus(type: KillProcessTask) { doLast { file("$projectDir/bin/prometheus").deleteDir() - file("$projectDir/bin/prometheus.tar.gz").delete() } } From e929ac51ec9b57160516a0d3348f8bf3b0c0f853 Mon Sep 17 00:00:00 2001 From: Andy Kwok Date: Tue, 28 Jan 2025 16:22:03 -0800 Subject: [PATCH 3/4] Add version as identifier Signed-off-by: Andy Kwok --- integ-test/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 5de28f938d..dbe23ad391 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -284,17 +284,17 @@ task startPrometheus(type: SpawnProcessTask) { mustRunAfter ':doctest:doctest' doFirst { - File downloadedPrometheus = Paths.get("$projectDir/bin", 'prometheus.tar.gz').toFile() - if (!downloadedPrometheus.exists()) { + File prometheusFilePath = Paths.get("$projectDir/bin", "prometheus-${prometheus_binary_version}.tar.gz").toFile() + if (!prometheusFilePath.exists()) { download.run { src getPrometheusBinaryLocation() - dest new File("$projectDir/bin", 'prometheus.tar.gz') + dest prometheusFilePath } } else { println "Prometheus File Already Exists" } copy { - from tarTree("$projectDir/bin/prometheus.tar.gz") + from tarTree("$projectDir/bin/prometheus-${prometheus_binary_version}.tar.gz") into "$projectDir/bin" } file("$projectDir/bin").eachDir { From c5938178e53681d60f55f6a65370752ce6a252a6 Mon Sep 17 00:00:00 2001 From: Andy Kwok Date: Wed, 29 Jan 2025 15:15:33 -0800 Subject: [PATCH 4/4] Remove print message Signed-off-by: Andy Kwok --- integ-test/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/integ-test/build.gradle b/integ-test/build.gradle index dbe23ad391..3827f9f465 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -290,8 +290,6 @@ task startPrometheus(type: SpawnProcessTask) { src getPrometheusBinaryLocation() dest prometheusFilePath } - } else { - println "Prometheus File Already Exists" } copy { from tarTree("$projectDir/bin/prometheus-${prometheus_binary_version}.tar.gz")