Skip to content

Fix zip distribution does not include leading directory#2672

Merged
peterzhuamazon merged 2 commits intoopensearch-project:mainfrom
peterzhuamazon:windows-assemble-subfolder
Sep 29, 2022
Merged

Fix zip distribution does not include leading directory#2672
peterzhuamazon merged 2 commits intoopensearch-project:mainfrom
peterzhuamazon:windows-assemble-subfolder

Conversation

@peterzhuamazon
Copy link
Copy Markdown
Member

Signed-off-by: Peter Zhu zhujiaxi@amazon.com

Description

Fix zip distribution does not include leading directory

Issues Resolved

#2306

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.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon added bug Something isn't working windows labels Sep 29, 2022
@peterzhuamazon peterzhuamazon self-assigned this Sep 29, 2022
@peterzhuamazon peterzhuamazon requested a review from a team as a code owner September 29, 2022 15:45
@peterzhuamazon
Copy link
Copy Markdown
Member Author

In every other distribution when you extract the artifact, the leading subdirectory will be in the pattern of opensearch-<version+qualifier>. In zip, this behavior does not present and the 2nd level subdirectories such as jdk, bin are directly exposed. Therefore the fix.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon merged commit 84d6797 into opensearch-project:main Sep 29, 2022
@peterzhuamazon peterzhuamazon deleted the windows-assemble-subfolder branch September 29, 2022 21:01
@peterzhuamazon
Copy link
Copy Markdown
Member Author

The groovy test is failing due to an unrelated issue, merge here.

@peterzhuamazon
Copy link
Copy Markdown
Member Author

peterzhuamazon added a commit to peterzhuamazon/opensearch-build that referenced this pull request Sep 30, 2022
…roject#2672)

* Fix zip distribution does not include leading directory

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Resolve the path issues failed on Windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
peterzhuamazon added a commit that referenced this pull request Oct 5, 2022
* Test windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Test windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Test snapshots

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add new manifests

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Test again

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Fix zip distribution does not include leading directory (#2672)

* Fix zip distribution does not include leading directory

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Resolve the path issues failed on Windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Tweak 1.3.6

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add some plugins to the 1.3.6 manifest (#2670)

* Add security plugin into the manifest

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Add more components

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Change when condition

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* change params

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add verify params

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add verify params

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove .swp

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more comment

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Fix issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* More changes

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Co-authored-by: Zelin Hao <87548827+zelinh@users.noreply.github.com>
monusingh-1 pushed a commit to monusingh-1/os_build that referenced this pull request Nov 2, 2022
…roject#2672)

* Fix zip distribution does not include leading directory

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Resolve the path issues failed on Windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Monu Singh <msnghgw@amazon.com>
monusingh-1 pushed a commit to monusingh-1/os_build that referenced this pull request Nov 2, 2022
…ch-project#2678)

* Test windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Test windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Test snapshots

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add new manifests

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Test again

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Fix zip distribution does not include leading directory (opensearch-project#2672)

* Fix zip distribution does not include leading directory

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Resolve the path issues failed on Windows

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Tweak 1.3.6

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add some plugins to the 1.3.6 manifest (opensearch-project#2670)

* Add security plugin into the manifest

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Add more components

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Change when condition

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* change params

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add verify params

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add verify params

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Remove .swp

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add more comment

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Fix issues

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* More changes

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Co-authored-by: Zelin Hao <87548827+zelinh@users.noreply.github.com>
Signed-off-by: Monu Singh <msnghgw@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working windows

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants