starlingx/root
Code Issues Proposed changes

build-remote-cli: remove useless defaults

Browse Source 
Remove default image names from the script. They are hard-coded, and yet
ignored -- the script always takes defaults from
starlingx/clients/remote_cli/docker_image_version.sh

Story: 2010226
Task: 48668

Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
Change-Id: I6c8a55e8ae77dbd7387025cf8bdbf3328ce44e31
This commit is contained in:
Davlet Panech 2023-08-24 12:15:49 -04:00
parent 0e782fe504
commit f16663c1c9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build-tools/build-remote-cli.sh
View File

@ -15,8 +15,8 @@ if [ -z "${MY_WORKSPACE}" -o -z "${MY_REPO}" ]; then
exit 1 exit 1
fi fi
PLATFORM_IMAGE="docker.io/starlingx/stx-platformclients:master-centos-stable-latest" PLATFORM_IMAGE=
APPLICATION_IMAGE="docker.io/starlingx/stx-openstackclients:master-centos-stable-latest" APPLICATION_IMAGE=
OUTPUT_FILE="stx-remote-cli" OUTPUT_FILE="stx-remote-cli"
VERSION="1.0" VERSION="1.0"
@ -32,18 +32,16 @@ function usage {
echo "$(basename $0) [--version <version>] [-o, --output <output_file>] [-t. --tag <image_tag>]" echo "$(basename $0) [--version <version>] [-o, --output <output_file>] [-t. --tag <image_tag>]"
echo " [--application-image <image>] [--platform-image <image>] [-h]" echo " [--application-image <image>] [--platform-image <image>] [-h]"
echo "Options:" echo "Options:"
echo " -h show help options" echo " -h,--help show help options"
echo " --version <version> specify remote CLI version" echo " --version <version> specify remote CLI version"
echo " (default value is 1.0)" echo " (default value is 1.0)"
echo " -o, --output <output_file> specify tarball output name" echo " -o, --output <output_file> specify tarball output name"
echo " (default value is stx-remote-cli)" echo " (default value is stx-remote-cli)"
echo " --platform-image <image> specify platform docker image tag." echo " --platform-image <image> override platform docker image"
echo " (default value is docker.io/starlingx/stx-platformclients:master-centos-stable-latest)" echo " --application-image <image> override application docker image"
echo " --application-image <image> specify application docker image."
echo " (default value is docker.io/starlingx/stx-openstackclients:master-centos-stable-latest)"
} }
OPTS=$(getopt -o h,o:,t: -l version:,output:,tag:,platform-image:,application-image: -- "$@") OPTS=$(getopt -o h,o:,t: -l help,version:,output:,tag:,platform-image:,application-image: -- "$@")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage usage
exit 1 exit 1
@ -57,7 +55,7 @@ while true; do
shift shift
break break
;; ;;
-h) -h|--help)
usage usage
exit 1 exit 1
;; ;;
@ -85,8 +83,8 @@ while true; do
esac esac
done done
# Clean the previous build
if [ -d ${BUILD_OUTPUT_PATH} ]; then if [ -d ${BUILD_OUTPUT_PATH} ]; then
# Clean the previous build
rm -rf ${BUILD_OUTPUT_PATH} rm -rf ${BUILD_OUTPUT_PATH}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Failed to cleanup workspace ${BUILD_OUTPUT_PATH}" >&2 echo "Failed to cleanup workspace ${BUILD_OUTPUT_PATH}" >&2