Add shorthand version of opensearch-benchmark invocation, osb (opensearch-project#745)

Signed-off-by: Ian Hoang <[email protected]>
Signed-off-by: Govind Kamat <[email protected]>

Author: IanHoang

docker/Dockerfile

@@ -7,58 +7,3 @@
 #
 FROM python:3.11.2-slim AS build-stage
 
-RUN apt-get -y update && \
-    apt-get install -y curl git gcc pbzip2 pigz make jq && \
-    apt-get -y upgrade
-
-COPY . opensearch-benchmark
-
-# There is no binary package currently available for yappi on ARM.
-RUN cd opensearch-benchmark; \
-    make build; \
-    if test "`uname -m`" = aarch64; then pip wheel yappi && cp yappi-*.whl dist; fi
-
-
-#
-# Stage 2: create image
-#
-FROM python:3.11.2-slim AS image-stage
-ENV BENCHMARK_RUNNING_IN_DOCKER=True
-
-RUN groupadd --gid 1000 opensearch-benchmark && \
-    useradd -d /opensearch-benchmark -m -k /dev/null -g 1000 -N -u 1000 -l -s /bin/bash benchmark
-
-WORKDIR /opensearch-benchmark
-
-RUN mkdir -p /opensearch-benchmark/.benchmark && \
-    chown -R 1000:0 /opensearch-benchmark/.benchmark
-
-COPY --from=build-stage /opensearch-benchmark/dist/*.whl ./
-
-RUN set -ex; \
-    apt-get -y update; \
-    apt-get install -y git pbzip2; \
-    apt-get -y upgrade; \
-    rm -rf /var/lib/apt/lists/*; \
-    PIP_ONLY_BINARY=h5py pip install *.whl; \
-    rm *.whl
-
-USER 1000
-
-ARG VERSION
-ARG BUILD_DATE
-
-LABEL org.label-schema.schema-version="1.0" \
-  org.label-schema.vendor="OpenSearch-Project" \
-  org.label-schema.name="opensearch-benchmark" \
-  org.label-schema.url="https://opensearch.org/" \
-  org.label-schema.version="$VERSION" \
-  org.label-schema.license="Apache-2.0" \
-  org.label-schema.description="A community driven, open source project to run performance tests for OpenSearch" \
-  org.label-schema.build-date="$BUILD_DATE" \
-  org.label-schema.vcs-url="https://github.com/opensearch-project/OpenSearch-Benchmark" \
-  "DOCKERFILE"="https://github.com/opensearch-project/opensearch-benchmark/blob/main/docker/Dockerfile"
-
-VOLUME ["/opensearch-benchmark/.benchmark"]
-
-ENTRYPOINT [ "opensearch-benchmark" ]

it/__init__.py

@@ -39,6 +39,7 @@
 CONFIG_NAMES = ["in-memory-it", "os-it"]
 DISTRIBUTIONS = ["1.3.9", "2.5.0"]
 WORKLOADS = ["geonames", "nyc_taxis", "http_logs", "nested"]
+BASE_COMMANDS = ["opensearch-benchmark", "osb"]
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
 
@@ -79,7 +80,7 @@ def wrapper(cfg, *args, **kwargs):
 
 
 def osbenchmark_command_line_for(cfg, command_line):
-    return f"opensearch-benchmark {command_line} --configuration-name='{cfg}'"
+    return f"{random.choice(BASE_COMMANDS)} {command_line} --configuration-name='{cfg}'"
 
 
 def osbenchmark(cfg, command_line):

setup.py

@@ -179,7 +179,9 @@ def str_from_file(name):
       entry_points={
           "console_scripts": [
               "opensearch-benchmark=osbenchmark.benchmark:main",
-              "opensearch-benchmarkd=osbenchmark.benchmarkd:main"
+              "opensearch-benchmarkd=osbenchmark.benchmarkd:main",
+              "osb=osbenchmark.benchmark:main",
+              "osbd=osbenchmark.benchmarkd:main",
           ],
       },
       scripts=['scripts/expand-data-corpus.py', 'scripts/pbzip2' ],