Allow helm charts to be built without requiring network access
openstack-helm-infra, openstack-helm and stx-openstack-helm no longer require network access, and can therefore be built as part of build-pkgs in std mode. The build-helm-charts.sh now packages from std results Story: 2004005 Task: 28792 Change-Id: If39686cfad5f0f92f6ddfb2351684294b134b5fa Depends-On: I113ec91b64faebf2e7e8154e4bfbe75acc3fbf43 Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
parent
189114b978
commit
2ae7465f07
|
@ -96,14 +96,7 @@ if [ -z "$(echo -n ${HELM_FILES})" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build the rpms
|
BUILD_OUTPUT_PATH=${MY_WORKSPACE}/std/build-helm/stx
|
||||||
build-pkgs --containers
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
echo "Failed build-pkgs --containers" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
BUILD_OUTPUT_PATH=${MY_WORKSPACE}/containers/build-helm/stx
|
|
||||||
if [ -d ${BUILD_OUTPUT_PATH} ]; then
|
if [ -d ${BUILD_OUTPUT_PATH} ]; then
|
||||||
# Wipe out the existing dir to ensure there are no stale files
|
# Wipe out the existing dir to ensure there are no stale files
|
||||||
rm -rf ${BUILD_OUTPUT_PATH}
|
rm -rf ${BUILD_OUTPUT_PATH}
|
||||||
|
@ -113,7 +106,7 @@ cd ${BUILD_OUTPUT_PATH}
|
||||||
|
|
||||||
# Extract the helm charts, order does not matter.
|
# Extract the helm charts, order does not matter.
|
||||||
declare -a FAILED
|
declare -a FAILED
|
||||||
RPMS_DIR=${MY_WORKSPACE}/containers/rpmbuild/RPMS
|
RPMS_DIR=${MY_WORKSPACE}/std/rpmbuild/RPMS
|
||||||
GREP_GLOB="-[^-]*-[^-]*.tis.noarch.rpm"
|
GREP_GLOB="-[^-]*-[^-]*.tis.noarch.rpm"
|
||||||
for helm_rpm in $(sed -e 's/#.*//' ${HELM_FILES} | sort -u); do
|
for helm_rpm in $(sed -e 's/#.*//' ${HELM_FILES} | sort -u); do
|
||||||
case $OS in
|
case $OS in
|
||||||
|
|
Loading…
Reference in New Issue