From 2ae7465f0707bc468a429f5b10a9c0d9180450ad Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 7 Jan 2019 13:25:32 -0600 Subject: [PATCH 1/2] 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 --- build-tools/build-helm-charts.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/build-tools/build-helm-charts.sh b/build-tools/build-helm-charts.sh index a20dc286..06c6d362 100755 --- a/build-tools/build-helm-charts.sh +++ b/build-tools/build-helm-charts.sh @@ -96,14 +96,7 @@ if [ -z "$(echo -n ${HELM_FILES})" ]; then exit 1 fi -# Build the rpms -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 +BUILD_OUTPUT_PATH=${MY_WORKSPACE}/std/build-helm/stx if [ -d ${BUILD_OUTPUT_PATH} ]; then # Wipe out the existing dir to ensure there are no stale files rm -rf ${BUILD_OUTPUT_PATH} @@ -113,7 +106,7 @@ cd ${BUILD_OUTPUT_PATH} # Extract the helm charts, order does not matter. declare -a FAILED -RPMS_DIR=${MY_WORKSPACE}/containers/rpmbuild/RPMS +RPMS_DIR=${MY_WORKSPACE}/std/rpmbuild/RPMS GREP_GLOB="-[^-]*-[^-]*.tis.noarch.rpm" for helm_rpm in $(sed -e 's/#.*//' ${HELM_FILES} | sort -u); do case $OS in From e687eab44e12aed8da288e342dd3d356ba44e4fc Mon Sep 17 00:00:00 2001 From: Felipe de Jesus Ruiz Garcia Date: Thu, 10 Jan 2019 14:14:40 -0500 Subject: [PATCH 2/2] Change file permissions of RPM's to 644 in the ISO This commit adds 644 permissions for all the files under /www/pages/feed//Packages, allowing the web server to reach all the required files to provision compute nodes. The internal web server used to provide rpms for the installation of computes and additional controller can fail to serve packages if these has different permission less than the required by the web server. lighttpd runs as a non-root user, however the content under /www/pages/feed//Packages is owned by root. If the files hasn't the "read for other" bit set, then this files won't be provided by the web server and thus causing a failure in the installation of the computes. We ensure that all the RPM's has the 644 permissions in that location after to build the StarlingX ISO image. Closes-Bug: #1794894 Change-Id: I928b156dad1cffcda2d9a8d41631a56ed7ee29f7 Signed-off-by: Felipe de Jesus Ruiz Garcia --- build-tools/build-iso | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-tools/build-iso b/build-tools/build-iso index 4302ed0a..5ef223ff 100755 --- a/build-tools/build-iso +++ b/build-tools/build-iso @@ -706,6 +706,9 @@ if [ "x${RELEASE_BUILD}" == "x" ]; then fi fi +\cd $OUTPUT_DIST_DIR +chmod -R 644 isolinux/Packages/* + # Extract installer files extract_installer_files