From: Jessica Wagantall Date: Thu, 30 May 2019 17:55:50 +0000 (-0700) Subject: Move yq install to python-tools-install X-Git-Tag: v0.38.1~2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F15789%2F2;p=releng%2Fglobal-jjb.git Move yq install to python-tools-install This will allow future scripts to use yq package. Change-Id: Ic855363698cfeb28c5f3428dd381f42c3ea5b1a3 Signed-off-by: Jessica Wagantall --- diff --git a/releasenotes/notes/move-yq-install-975a96e15d33bbb3.yaml b/releasenotes/notes/move-yq-install-975a96e15d33bbb3.yaml new file mode 100644 index 00000000..3e046fde --- /dev/null +++ b/releasenotes/notes/move-yq-install-975a96e15d33bbb3.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + Add yq install as part of python-tools-install.sh + Allow future scripts to use yq package. diff --git a/shell/docker-get-yaml-tag.sh b/shell/docker-get-yaml-tag.sh index 936c272f..2a1bbdc6 100644 --- a/shell/docker-get-yaml-tag.sh +++ b/shell/docker-get-yaml-tag.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2019 The Linux Foundation and others. @@ -13,10 +13,6 @@ echo "---> docker-get-yaml-tag.sh" set -eu -o pipefail -# Install yq to read container-tag.yaml -python -m pip install --user --quiet --upgrade yq -export PATH="/home/jenkins/.local/bin:$PATH" - cd "$DOCKER_ROOT" container_tag_file=container-tag.yaml diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh index 9eff4603..6d519d94 100644 --- a/shell/python-tools-install.sh +++ b/shell/python-tools-install.sh @@ -49,6 +49,7 @@ python-heatclient~=1.16.1 python-openstackclient~=3.16.0 dogpile.cache~=0.6.8 # Version 0.7.[01] seems to break openstackclient niet~=1.4.2 # Extract values from yaml +yq~=2.7.2 EOF # Use `python -m pip` to ensure we are using the latest version of pip