Merge remote-tracking branch 'gerrit/master' into f/centos76
Change-Id: Icda32d3d7683aa38ec84e5e038d668367cec0567 Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
commit
ae9d73fc02
|
@ -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
|
||||||
|
|
|
@ -706,6 +706,9 @@ if [ "x${RELEASE_BUILD}" == "x" ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
\cd $OUTPUT_DIST_DIR
|
||||||
|
chmod -R 644 isolinux/Packages/*
|
||||||
|
|
||||||
# Extract installer files
|
# Extract installer files
|
||||||
extract_installer_files
|
extract_installer_files
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue