Skip to content

Commit

Permalink
Package pbzip2 binaries, so they get installed automatically (opensea…
Browse files Browse the repository at this point in the history
…rch-project#551)

Signed-off-by: Govind Kamat <[email protected]>
  • Loading branch information
gkamat authored and finnroblin committed Jul 19, 2024
1 parent 11afbea commit ab8192d
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion RELEASE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ NOTE: The version number below is in semantic format, for instance, `1.2.0`.
4. repository: opensearchstaging, image: opensearch-benchmark:<VERSION> → repository: public.ecr.aws/opensearchproject, image: opensearch-benchmark:latest

5. See if OpenSearch-Benchmark Tags is Published:
1. Check that the version appears in GitHub (https://github.com/opensearch-project/opensearch-benchmark/releases) and is marked as the “latest” release. There should be an associated changelog as well. Clicking on the “Tags” tab should indicate the version number is one of the project’s tags and its timestamp should match that of the last commit.
1. Check that the version appears in GitHub (https://github.com/opensearch-project/opensearch-benchmark/releases) and is marked as the “latest” release. There should be an associated changelog as well. Clicking on the “Tags” tab should indicate the version number is one of the project’s tags and its timestamp should match that of the last commit. If there was an error that prevented the release from being published, but this was fixed manually, click on the edit button (pencil icon) next to the release. This will provide options to generate the release notes, publish the release and label it as the "latest" one.
2. Check Docker Hub Production: https://hub.docker.com/r/opensearchproject/opensearch-benchmark. Both “latest” and the published release should appear on the page along with the appropriate publication timestamp.
3. Check ECR: https://gallery.ecr.aws/opensearchproject/opensearch-benchmark. The dropdown box at the top should list both “latest” and the published release as entries. The publication time is also indicated.

Expand Down
9 changes: 9 additions & 0 deletions THIRD_PARTY.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

OpenSearch Benchmark includes the following third-party software:

This program, "pbzip2" is copyright (C) 2003-2011 Jeff Gilchrist.
All rights reserved.

The library "libbzip2" which pbzip2 uses, is copyright
(C) 1996-2019 Julian R Seward. All rights reserved.

Binary file added osbenchmark/decompressors/pbzip2-Darwin-arm64
Binary file not shown.
Binary file added osbenchmark/decompressors/pbzip2-Darwin-x86_64
Binary file not shown.
Binary file added osbenchmark/decompressors/pbzip2-Linux-aarch64
Binary file not shown.
Binary file added osbenchmark/decompressors/pbzip2-Linux-x86_64
Binary file not shown.
8 changes: 8 additions & 0 deletions scripts/pbzip2
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env sh

dir=`python3 -c 'import osbenchmark; print(osbenchmark.__path__[0])'`
os=`uname`
arch=`uname -m`

exec $dir/decompressors/pbzip2-$os-$arch "$@"

5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ def str_from_file(name):
# However, with the pattern ">=3.5.*,<=3.8.*", the version "3.8.0" is not accepted. Therefore, we match
# the minor version after the last supported one (i.e. if 3.8 is the last supported, we'll emit "<3.9")
python_requires=">={},<{}".format(first_supported_version, first_unsupported_version),
package_data={"": ["*.json", "*.yml"]},
package_data={"": ["*.json", "*.yml"],
"osbenchmark": ["decompressors/*"]},
install_requires=install_requires,
test_suite="tests",
tests_require=tests_require,
Expand All @@ -181,7 +182,7 @@ def str_from_file(name):
"opensearch-benchmarkd=osbenchmark.benchmarkd:main"
],
},
scripts=['scripts/expand-data-corpus.py'],
scripts=['scripts/expand-data-corpus.py', 'scripts/pbzip2' ],
classifiers=[
"Topic :: System :: Benchmark",
"Development Status :: 5 - Production/Stable",
Expand Down

0 comments on commit ab8192d

Please sign in to comment.