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.

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

Support -p platform in build scripts. #748

Merged
merged 2 commits into from
Oct 14, 2021

Conversation

dblock
Copy link
Member

@dblock dblock commented Oct 14, 2021

Signed-off-by: dblock [email protected]

Description

Support for #740, adds -p platform to build scripts so we can pass linux or darwin around and default it to uname -s. This required re-overwriting common-utils, job-scheduler and alerting scripts.

ScriptFinder is incorrectly picking the override from the repo with source code. The build repo should be the one always picked first because that's where we'd make a last minute fix, updated.

Auto-resolving JAVA_HOME on MacOS.

Check List

  • Commits are signed per the DCO using --signoff

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.

@dblock dblock requested review from peternied and kavilla October 14, 2021 20:31
@dblock dblock mentioned this pull request Oct 14, 2021
1 task
@codecov-commenter
Copy link

codecov-commenter commented Oct 14, 2021

Codecov Report

Merging #748 (8385844) into main (34cb6c5) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #748      +/-   ##
==========================================
+ Coverage   91.16%   91.17%   +0.01%     
==========================================
  Files          75       75              
  Lines        1980     1984       +4     
==========================================
+ Hits         1805     1809       +4     
  Misses        175      175              
Impacted Files Coverage Δ
src/paths/script_finder.py 100.00% <ø> (ø)
src/build_workflow/build_target.py 100.00% <100.00%> (ø)
src/build_workflow/builder.py 100.00% <100.00%> (ø)
src/system/os.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6d52b26...8385844. Read the comment docs.

arch=None,
name=None,
snapshot=True,
build_id=None,
output_dir="artifacts",
):
self.build_id = os.getenv("OPENSEARCH_BUILD_ID") or os.getenv("OPENSEARCH_DASHBOARDS_BUILD_ID") or build_id or uuid.uuid4().hex
self.build_id = os.getenv("BUILD_NUMBER") or build_id or uuid.uuid4().hex
Copy link
Member Author

Choose a reason for hiding this comment

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

Side effect of #730 that we forgot to fix.

Copy link
Member

Choose a reason for hiding this comment

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

Yea, looks like those bundle numbers became 8c363d37f71349b1add343c0c48945a7

@dblock dblock requested a review from VachaShah October 14, 2021 21:05
Copy link
Contributor

@VachaShah VachaShah left a comment

Choose a reason for hiding this comment

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

LGTM!

@dblock dblock merged commit 7de6526 into opensearch-project:main Oct 14, 2021
@dblock dblock deleted the add-platform branch October 14, 2021 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants