Skip to content

Commit 8a7ed06

Browse files
authored
Package pbzip2 binaries, so they get installed automatically (opensearch-project#551)
Signed-off-by: Govind Kamat <govkamat@amazon.com>
1 parent 3caff3d commit 8a7ed06

8 files changed

+21
-3
lines changed

RELEASE_GUIDE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ NOTE: The version number below is in semantic format, for instance, `1.2.0`.
9090
4. repository: opensearchstaging, image: opensearch-benchmark:<VERSION> → repository: public.ecr.aws/opensearchproject, image: opensearch-benchmark:latest
9191

9292
5. See if OpenSearch-Benchmark Tags is Published:
93-
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.
93+
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.
9494
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.
9595
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.
9696

THIRD_PARTY.txt

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
OpenSearch Benchmark includes the following third-party software:
3+
4+
This program, "pbzip2" is copyright (C) 2003-2011 Jeff Gilchrist.
5+
All rights reserved.
6+
7+
The library "libbzip2" which pbzip2 uses, is copyright
8+
(C) 1996-2019 Julian R Seward. All rights reserved.
9+
113 KB
Binary file not shown.
112 KB
Binary file not shown.
220 KB
Binary file not shown.
80.7 KB
Binary file not shown.

scripts/pbzip2

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env sh
2+
3+
dir=`python3 -c 'import osbenchmark; print(osbenchmark.__path__[0])'`
4+
os=`uname`
5+
arch=`uname -m`
6+
7+
exec $dir/decompressors/pbzip2-$os-$arch "$@"
8+

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ def str_from_file(name):
168168
# However, with the pattern ">=3.5.*,<=3.8.*", the version "3.8.0" is not accepted. Therefore, we match
169169
# the minor version after the last supported one (i.e. if 3.8 is the last supported, we'll emit "<3.9")
170170
python_requires=">={},<{}".format(first_supported_version, first_unsupported_version),
171-
package_data={"": ["*.json", "*.yml"]},
171+
package_data={"": ["*.json", "*.yml"],
172+
"osbenchmark": ["decompressors/*"]},
172173
install_requires=install_requires,
173174
test_suite="tests",
174175
tests_require=tests_require,
@@ -181,7 +182,7 @@ def str_from_file(name):
181182
"opensearch-benchmarkd=osbenchmark.benchmarkd:main"
182183
],
183184
},
184-
scripts=['scripts/expand-data-corpus.py'],
185+
scripts=['scripts/expand-data-corpus.py', 'scripts/pbzip2' ],
185186
classifiers=[
186187
"Topic :: System :: Benchmark",
187188
"Development Status :: 5 - Production/Stable",

0 commit comments

Comments
 (0)