Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Cache Prometheus binary #3261

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Build: Cache Prometheus binary #3261

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d6f849
Prometheus binary check
andy-k-improving Jan 23, 2025
b3873c7
Update prometheus script
andy-k-improving Jan 23, 2025
e929ac5
Add version as identifier
andy-k-improving Jan 29, 2025
c593817
Remove print message
andy-k-improving Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions integ-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,15 @@ task startPrometheus(type: SpawnProcessTask) {
mustRunAfter ':doctest:doctest'

doFirst {
download.run {
src getPrometheusBinaryLocation()
dest new File("$projectDir/bin", 'prometheus.tar.gz')
File prometheusFilePath = Paths.get("$projectDir/bin", "prometheus-${prometheus_binary_version}.tar.gz").toFile()
if (!prometheusFilePath.exists()) {
download.run {
src getPrometheusBinaryLocation()
dest prometheusFilePath
}
}
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 {
Expand All @@ -306,7 +309,6 @@ task startPrometheus(type: SpawnProcessTask) {
task stopPrometheus(type: KillProcessTask) {
doLast {
file("$projectDir/bin/prometheus").deleteDir()
file("$projectDir/bin/prometheus.tar.gz").delete()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can delete the tar.gz if it exists:

"prometheus-${prometheus_binary_version}.tar.gz"

Copy link
Contributor Author

@andy-k-improving andy-k-improving Jan 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum, I'm thinking this differently, as if we keep this delete call with prometheus-versions.gz.
The module wouldn't be able to achieve the cache behaviour, because prometheus-versions.gz will always be absent during the next run of integ-test.startPrometheus( ).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...its the tar.gz that contains the version. Right. I was thinking we were checking for the binary.
Problem is that old tar.gz will stick around.
Can we make sure that all the prometheus files (tar.gz and binary) gets removed on a 'clean' call at least? We are currently calling stopPrometheus, but we can do something extra.

}
}

Expand Down
Loading