Integ tests fix for arm64.[Failure in starting up prometheus server] #1069
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## 2.x #1069 +/- ##
============================================
- Coverage 98.27% 95.71% -2.57%
Complexity 3351 3351
============================================
Files 327 337 +10
Lines 8457 9115 +658
Branches 553 672 +119
============================================
+ Hits 8311 8724 +413
- Misses 142 334 +192
- Partials 4 57 +53
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
vmmusings
force-pushed
the
integ-test-archtype-fix
branch
from
aa2ad60 to
141296c
Compare
penghuo
reviewed
Nov 14, 2022
build.gradle
Outdated
| @@ -21,6 +21,29 @@ buildscript { | |||
| // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT (opensearch_build) | |||
| opensearch_build += "-SNAPSHOT" | |||
| } | |||
| getPrometheusBinaryLocation = { -> | |||
| def os = org.gradle.internal.os.OperatingSystem.current() | |||
| println "*** Building on ${os.familyName} / ${os.name} / ${os.version} / ${System.getProperty("os.arch")}." | |||
penghuo
reviewed
Nov 14, 2022
integ-test/build.gradle
Outdated
Comment on lines
145
to
148
| doLast { | ||
| println "Deleting prometheus folder" | ||
| println file("$projectDir/bin/prometheus").deleteDir() | ||
| println file("$projectDir/bin/prometheus.tar.gz").delete() | ||
| } |
There was a problem hiding this comment.
I am deleting the downloaded artifacts after the integ tests.
There was a problem hiding this comment.
Will remove println statements.
penghuo
reviewed
Nov 14, 2022
build.gradle
Outdated
| if (os.isMacOsX()) { | ||
| //x64, x86-64, amd64 | ||
| if (System.getProperty("os.arch").startsWith("x") || System.getProperty("os.arch").startsWith("amd")) { | ||
| return "https://github.com/prometheus/prometheus/releases/download/v2.37.2/prometheus-2.37.2.darwin-amd64.tar.gz" |
There was a problem hiding this comment.
how about compose downlink using version, platform and arch. prometheus-{version}.{platform}-{arch}
There was a problem hiding this comment.
I have done that...I couldn't push the latest commit last night.
There are too many names for the same arch type and OS family. So slightly simplified the logic.
vmmusings
force-pushed
the
integ-test-archtype-fix
branch
from
141296c to
985e2f2
Compare
Signed-off-by: vamsi-amazon <[email protected]>
vmmusings
force-pushed
the
integ-test-archtype-fix
branch
from
985e2f2 to
f099136
Compare
vmmusings
changed the title
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Nov 14, 2022
…1069) Signed-off-by: vamsi-amazon <[email protected]> (cherry picked from commit 662a938)
vmmusings
added a commit
that referenced
this pull request
Nov 14, 2022
…1069) (#1073) Signed-off-by: vamsi-amazon <[email protected]> (cherry picked from commit 662a938) Co-authored-by: vamsi-amazon <[email protected]>
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: vamsi-amazon [email protected]
Description
This is to fix integration test errors for arm64 archetype.
RCA: using wrong binary to start prometheus server for integ tests.
https://build.ci.opensearch.org/blue/organizations/jenkins/integ-test/detail/integ-test/3242/pipeline/131
Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.