Add -l to /bin/bash shebang line at top of docker-get-container-tag.sh
to make it a login shell, which automatically includes
/home/jenkins/.local/bin on the path, because that is where pip
installs the yq command.
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I6b715b8d3757414344fe154d9b8a0d44feb1daaa
--- /dev/null
+---
+fixes:
+ - |
+ Add -l to /bin/bash shebang line at top of docker-get-container-tag.sh
+ to make it a login shell, which automatically includes
+ /home/jenkins/.local/bin on the path, because that is where pip
+ installs the yq command.
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2019 The Linux Foundation and others.
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2019 The Linux Foundation and others.
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
##############################################################################
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
##############################################################################
echo "---> docker-get-container-tag.sh"
echo "---> docker-get-container-tag.sh"
# Gets the container tag per $CONTAINER_TAG_METHOD
# For YAML file use directory $CONTAINER_TAG_YAML_DIR
# Gets the container tag per $CONTAINER_TAG_METHOD
# For YAML file use directory $CONTAINER_TAG_YAML_DIR
-# if value is provided, else fall back to $DOCKER_ROOT
+# if a value is provided, else fall back to $DOCKER_ROOT
+# use login flag to get $HOME/.local/bin in PATH
elif [[ $CONTAINER_TAG_METHOD == "git-describe" ]]; then
tag=$(git describe)
elif [[ $CONTAINER_TAG_METHOD == "yaml-file" ]]; then
elif [[ $CONTAINER_TAG_METHOD == "git-describe" ]]; then
tag=$(git describe)
elif [[ $CONTAINER_TAG_METHOD == "yaml-file" ]]; then
- # TODO: set default value in JJB?
dir=${CONTAINER_TAG_YAML_DIR:-$DOCKER_ROOT}
tag_file=$dir/container-tag.yaml
if [[ -f $tag_file ]]; then
dir=${CONTAINER_TAG_YAML_DIR:-$DOCKER_ROOT}
tag_file=$dir/container-tag.yaml
if [[ -f $tag_file ]]; then
+ # pip installs yq to $HOME/.local/bin
tag=$(yq -r .tag "$tag_file")
else
echo "File $tag_file not found."
tag=$(yq -r .tag "$tag_file")
else
echo "File $tag_file not found."