From 42f8585ebb8fffad19a89314659ab9129176c3e9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 1 Oct 2016 13:18:11 +0200 Subject: build: Rework patch mechanism for Fuel submodules While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii --- ...date-bootstrap-target-build-time-estimate.patch | 39 +++++++++ .../0002-Build-bootstrap-image-for-arm64.patch | 31 +++++++ ...bootstrap-Use-public-Ubuntu-ports-mirrors.patch | 48 +++++++++++ ...ipts-Enable-systemd-binfmt-for-first-boot.patch | 94 ++++++++++++++++++++++ ...-Increase-max-shell-command-timeout-to-2h.patch | 49 +++++++++++ ...tstrap-Use-gzip-instead-of-xz-compression.patch | 52 ++++++++++++ ...ilgun-Increase-target-image-build-timeout.patch | 36 +++++++++ ....micro-Increase-profile-RAM-size-to-128MB.patch | 38 +++++++++ 8 files changed, 387 insertions(+) create mode 100644 patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch create mode 100644 patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch create mode 100644 patches/opnfv-fuel/cross-bootstrap/0003-bootstrap-Use-public-Ubuntu-ports-mirrors.patch create mode 100644 patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch create mode 100644 patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch create mode 100644 patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch create mode 100644 patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch create mode 100644 patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-128MB.patch (limited to 'patches/opnfv-fuel/cross-bootstrap') diff --git a/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch new file mode 100644 index 00000000..91ba18a0 --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch @@ -0,0 +1,39 @@ +From: Alexandru Avadanii +Date: Mon, 9 May 2016 17:05:53 +0200 +Subject: [PATCH] UX: Update bootstrap/target build time estimate. + +While building for a different architecture (e.g. AArch64 on x86_64), +the bootstrap/target image build may take longer, due to latency +introduced by using qemu-user-static. + +Signed-off-by: Alexandru Avadanii +--- + .../0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +index 446d0b6..c2e664c 100644 +--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch ++++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +@@ -10,6 +10,21 @@ diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh + index 3197c91..db3123d 100755 + --- a/iso/bootstrap_admin_node.sh + +++ b/iso/bootstrap_admin_node.sh ++@@ -86,9 +86,11 @@ ++ http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/\ ++ bootstrap_troubleshoot.html" ++ bs_progress_message="There is no active bootstrap. Bootstrap image building \ ++-is in progress. Usually it takes 15-20 minutes. It depends on your internet \ ++-connection and hardware performance. After bootstrap image becomes available, \ ++-reboot nodes that failed to be discovered." +++is in progress. Usually it takes 15-20 minutes for a native build (x86_64) \ +++and/or 30-45 minutes for each cross-build (e.g. AArch64). \ +++It depends on your internet connection, hardware performance and selected \ +++bootstrap architecture(s). This ISO supports AArch64 only. After bootstrap \ +++image becomes available, reboot nodes that failed to be discovered." ++ bs_done_message="Default bootstrap image building done. Now you can boot new \ ++ nodes over PXE, they will be discovered and become available for installing \ ++ OpenStack on them" + @@ -339,8 +339,22 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail + set +x + echo "Done!" diff --git a/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch new file mode 100644 index 00000000..836cb2cf --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch @@ -0,0 +1,31 @@ +From: Stanislaw Kardach +Date: Thu, 3 Mar 2016 19:04:07 +0100 +Subject: [PATCH] Build bootstrap image for arm64 + +For now the arch is hardcoded for simplicity. We should detect this +but how? If we're multi-arch then one bootstrap image should be built +per supported arch. This requires Fuel refactoring. +--- + .../0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +index c2e664c..12d0dfb 100644 +--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch ++++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +@@ -73,6 +73,15 @@ index 3197c91..db3123d 100755 + + # Enable iptables + systemctl enable iptables.service ++@@ -484,7 +490,7 @@ ++ local ret=1 ++ echo ${bs_progress_message} >&2 ++ set_ui_bootstrap_error "${bs_progress_message}" >&2 ++- if fuel-bootstrap -v --debug build --activate >>"$bs_build_log" 2>&1; then +++ if fuel-bootstrap -v --debug build --target_arch arm64 --activate >>"$bs_build_log" 2>&1; then ++ ret=0 ++ fuel notify --topic "done" --send "${bs_done_message}" ++ else + @@ -532,6 +545,16 @@ systemctl start ntpd + + bash /etc/rc.local diff --git a/patches/opnfv-fuel/cross-bootstrap/0003-bootstrap-Use-public-Ubuntu-ports-mirrors.patch b/patches/opnfv-fuel/cross-bootstrap/0003-bootstrap-Use-public-Ubuntu-ports-mirrors.patch new file mode 100644 index 00000000..157306b2 --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0003-bootstrap-Use-public-Ubuntu-ports-mirrors.patch @@ -0,0 +1,48 @@ +From: Alexandru Avadanii +Date: Thu, 3 Mar 2016 19:18:27 +0100 +Subject: [PATCH] bootstrap: Use public Ubuntu-ports mirrors. + +Instead of relying on 127.0.0.1 partial Ubuntu mirror, use +public archives. +While doing so, switch to Ubuntu-ports, enabling building arm64 +bootstraps. + +NOTE: This disables the abillity to build amd64 bootstraps with +current config. +--- + build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +index 264ae0e..17e161f 100644 +--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml ++++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +@@ -49,19 +49,19 @@ + repos: + - name: ubuntu + section: "main universe multiverse" +- uri: "http://127.0.0.1:8080/mirrors/ubuntu" ++ uri: "http://ports.ubuntu.com/ubuntu-ports" + priority: + suite: trusty + type: deb + - name: ubuntu-updates + section: "main universe multiverse" +- uri: "http://127.0.0.1:8080/mirrors/ubuntu" ++ uri: "http://ports.ubuntu.com/ubuntu-ports" + priority: + suite: trusty-updates + type: deb + - name: ubuntu-security + section: "main universe multiverse" +- uri: "http://127.0.0.1:8080/mirrors/ubuntu" ++ uri: "http://ports.ubuntu.com/ubuntu-ports" + priority: + suite: trusty-security + type: deb +@@ -73,4 +73,5 @@ + type: deb + skip_default_img_build: false + direct_repo_addresses: ++ - "ports.ubuntu.com" + - "127.0.0.1" diff --git a/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch b/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch new file mode 100644 index 00000000..26b898fe --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch @@ -0,0 +1,94 @@ +From: Alexandru Avadanii +Date: Thu, 9 Jun 2016 19:46:56 +0200 +Subject: [PATCH] post-scripts: Enable systemd-binfmt for first boot. + +IMPORTANT: +This commit introduces the following file on Fuel Master, +containing the list of arch supported for target nodes: +. + +This file is created AFTER pre.d OPNFV scripts are ran, also by +bootstrap_admin_node.sh, BEFORE the post.d scripts are executed. +NOTE: Arch format is the same used by dpkg (e.g.: "amd64 arm64") + +Based on the number of foreign architectures we should support +(the list of archs in /etc/fuel_openstack_arch minus native arch), +we determine whether cross-builds are expected, in which case +binfmt support should be functional during first Fuel Master boot. + +Since systemd-binfmt service has a series of preconditions for +starting, which are tested early during first boot, some of them +are NOT YET true (e.g. no binfmt handlers are present before +qemu-user-static package is installed), so the service is not +automatically started. Of course, this only affects the first boot. + +Finally, this commit adds an OPNFV post-install script in +/opt/opnfv/bootstrap/post.d, which starts systemd-binfmt service. +--- + .../post-scripts/80_prepare_cross_builds.sh | 32 ++++++++++++++++++++++ + ...PNFV-Additions-to-bootstrap_admin_node.sh.patch | 13 +++++++++ + 2 files changed, 45 insertions(+) + create mode 100755 build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh + +diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +new file mode 100755 +index 0000000..01eb2e2 +--- /dev/null ++++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +@@ -0,0 +1,32 @@ ++#/bin/sh ++############################################################################## ++# Copyright (c) 2016 Enea AB and others. ++# Alexandru.Avadanii@enea.com ++# All rights reserved. This program and the accompanying materials ++# are made available under the terms of the Apache License, Version 2.0 ++# which accompanies this distribution, and is available at ++# http://www.apache.org/licenses/LICENSE-2.0 ++############################################################################## ++ ++echo "Preparing for cross-building bootstrap/target images" ++ ++# Fmt handlers are set up by qemu-user-static (after systemd-binfmt ++# prerequisites are checked during first boot of Fuel Master node). ++ ++# Cross-building support provides dpkg, as a fuel-agent dependency ++if which dpkg > /dev/null 2>&1; then ++ # /etc/fuel_openstack_arch is created by bootstrap_admin_node.sh ++ FOREIGN_ARCH_CNT=$(sed -e "s/$(dpkg --print-architecture)//" \ ++ /etc/fuel_openstack_arch | wc -w) ++ if [ ${FOREIGN_ARCH_CNT} -gt 0 ]; then ++ # If no fmt handlers are configured, the service is not started, ++ # so request it explicitly (only necessary for the first boot). ++ systemctl start systemd-binfmt ++ if [ $? -ne 0 ]; then ++ echo "Error starting systemd-binfmt!" ++ exit 1 ++ fi ++ fi ++fi ++ ++echo "Done preparing cross-building" +diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +index 12d0dfb..81d196b 100644 +--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch ++++ b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch +@@ -25,6 +25,19 @@ index 3197c91..db3123d 100755 + bs_done_message="Default bootstrap image building done. Now you can boot new \ + nodes over PXE, they will be discovered and become available for installing \ + OpenStack on them" ++@@ -239,6 +239,12 @@ ++ # /etc/fuel_openstack_version is provided by 'fuel-openstack-metadata' package ++ OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version) ++ +++# FIXME(armband): This part might be moved to an earlier stage later +++# /etc/fuel_openstack_arch is constructed based on local mirror metadata +++grep -oP "^Architectures: \K.*$" \ +++ ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/dists/mos${FUEL_RELEASE}/Release > \ +++ /etc/fuel_openstack_arch +++ ++ # We do not ship debian-installer kernel and initrd on ISO. ++ # But we still need to be able to create ubuntu cobbler distro ++ # which requires kernel and initrd to be available. So, we + @@ -339,8 +339,22 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail + set +x + echo "Done!" diff --git a/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch b/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch new file mode 100644 index 00000000..c04cc8ab --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch @@ -0,0 +1,49 @@ +From: Alexandru Avadanii +Date: Thu, 9 Jun 2016 21:37:48 +0200 +Subject: [PATCH] mcagent: Increase max shell command timeout to 2h + +Since `execute_shell_command` mcagent is used for building the target +image and the timeout provided in the astute task is just respected on +the Astute level (on mcollective level this timeout is actually a +minumum between value provided and ddl value) we need to increase it +for Armband operation. + +Because Armband builds the target image via `qemu-debootstrap`, it can +take more than 1 hour to finish the building. Therefore aside of +increasing the timeout in the Astute task, the maximum timeout value +for mcagent has to be increased. + +[ Alexandru Avadanii ] +Repackaged, based on Stan's `fuel-astute` patch. + +Signed-off-by: Stanislaw Kardach +Signed-off-by: Alexandru Avadanii +--- + .../f_bootstrap/post-scripts/80_prepare_cross_builds.sh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +index 01eb2e2..12f66e6 100755 +--- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh ++++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +@@ -26,6 +26,20 @@ if which dpkg > /dev/null 2>&1; then + echo "Error starting systemd-binfmt!" + exit 1 + fi ++ ++ # Cross-build timeout adjustments ++ # ++ # Since `execute_shell_command` mcagent is used for building the target ++ # image and the timeout provided in the astute task is just respected on ++ # the Astute level (on mcollective level this timeout is actually a ++ # minumum between value provided and ddl value) we need to increase it ++ # for cross-build operations. ++ ++ # Building the target image via `qemu-debootstrap` can take more than ++ # 1 hour. Therefore aside of increasing the timeout in the Astute task, ++ # the maximum timeout value for mcagent has to be increased (use 2h). ++ sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \ ++ /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl + fi + fi + diff --git a/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch b/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch new file mode 100644 index 00000000..ccbd3e1c --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch @@ -0,0 +1,52 @@ +From: Alexandru Avadanii +Date: Fri, 10 Jun 2016 22:30:29 +0200 +Subject: [PATCH] bootstrap: Use gzip instead of xz compression. + +bootstrap mksquashfs using qemu-user-static is extremely slow, +taking up to one hour. gzip, on the other hand, is reasonably fast. +According to [1], xz is slower, with not much size gain. + +[1] https://jonathancarter.org/2015/04/06/squashfs-performance-testing/ + +Signed-off-by: Alexandru Avadanii +--- + .../post-scripts/80_prepare_cross_builds.sh | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +index 12f66e6..3cb22f3 100755 +--- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh ++++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +@@ -27,6 +27,11 @@ if which dpkg > /dev/null 2>&1; then + exit 1 + fi + ++ # Determine python site-packages directory location ++ PYTHON_SITEPKGS_DIR=$(python -c \ ++ "from distutils.sysconfig import get_python_lib; print(get_python_lib())") ++ [ -d ${PYTHON_SITEPKGS_DIR} ] || exit 1 ++ + # Cross-build timeout adjustments + # + # Since `execute_shell_command` mcagent is used for building the target +@@ -40,6 +45,20 @@ if which dpkg > /dev/null 2>&1; then + # the maximum timeout value for mcagent has to be increased (use 2h). + sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \ + /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl ++ ++ # Bootstrap: Use gzip instead of xz compression. ++ # ++ # bootstrap mksquashfs via `qemu-user-static` is extremely slow, ++ # taking up to one hour. gzip, on the other hand, is reasonably fast. ++ ++ # See the following article for a comparison between gzip and xz ++ # https://jonathancarter.org/2015/04/06/squashfs-performance-testing/ ++ # xz is slower, with very little size gain. ++ if [ -f ${PYTHON_SITEPKGS_DIR}/fuel_bootstrap/consts.py ]; then ++ sed -i.bak -r "s/^(\s+'compress_format'\s*:\s*').*?('.*)$/\1gzip\2/g" \ ++ ${PYTHON_SITEPKGS_DIR}/fuel_bootstrap/consts.py ++ echo "INFO: [xz] => [gzip] updated bootstrap initrd / rootfs compression." ++ fi + fi + fi + diff --git a/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch b/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch new file mode 100644 index 00000000..19a025f7 --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch @@ -0,0 +1,36 @@ +From: Alexandru Avadanii +Date: Sat, 11 Jun 2016 21:37:29 +0200 +Subject: [PATCH] Nailgun: Increase target image build timeout + +Currently we're close to 40 minutes of image building (thanks to +qemu-debootstrap). If network connectivity is a bit slow (happened to +me) it's easy to go over 1h limit. Therefore let's push this to 2 hours +to be safer. + +[ Alexandru Avadanii ] +Moved original patch wrote by Stan to post-install. + +Signed-off-by: Stanislaw Kardach +Signed-off-by: Alexandru Avadanii +--- + .../f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +index 3cb22f3..c106bc3 100755 +--- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh ++++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +@@ -45,6 +45,13 @@ if which dpkg > /dev/null 2>&1; then + # the maximum timeout value for mcagent has to be increased (use 2h). + sed -i.bak -r 's/^(\s+:timeout\s*=>)\s*[[:digit:]]+$/\1 7200/' \ + /usr/libexec/mcollective/mcollective/agent/execute_shell_command.ddl ++ # Update nailgun timeout setting (2h) ++ if [ -f ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml ]; then ++ sed -i.bak -r \ ++ 's/^(PROVISIONING_IMAGES_BUILD_TIMEOUT:)\s*[[:digit:]]+$/\1 7200/' \ ++ ${PYTHON_SITEPKGS_DIR}/nailgun/settings.yaml ++ echo "INFO: [1h] => [2h] updated nailgun image build timeout." ++ fi + + # Bootstrap: Use gzip instead of xz compression. + # diff --git a/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-128MB.patch b/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-128MB.patch new file mode 100644 index 00000000..a54222a4 --- /dev/null +++ b/patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-128MB.patch @@ -0,0 +1,38 @@ +From: Alexandru Avadanii +Date: Sat, 11 Jun 2016 23:34:48 +0200 +Subject: [PATCH] m1.micro: Increase profile RAM size to 128MB. + +TestVM (cirros) on aarch64 requires more than 64MB RAM. +Keep profiles uniform across all archs. + +Signed-off-by: Alexandru Avadanii +--- + .../f_bootstrap/post-scripts/80_prepare_cross_builds.sh | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +index c106bc3..0b48ca2 100755 +--- a/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh ++++ b/build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh +@@ -66,6 +66,21 @@ if which dpkg > /dev/null 2>&1; then + ${PYTHON_SITEPKGS_DIR}/fuel_bootstrap/consts.py + echo "INFO: [xz] => [gzip] updated bootstrap initrd / rootfs compression." + fi ++ ++ # TestVM (cirros) adjustments for cross-arch ++ # ++ # TestVM (cirros) on aarch64 requires more than 64MB RAM. ++ # Keep profiles uniform across all archs by bumping micro flavor specs. ++ # m1.micro: Increase profile RAM size to 128MB. ++ OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version) ++ CONTROLLER_PP="/etc/puppet/${OPENSTACK_VERSION}/modules/openstack_tasks" ++ CONTROLLER_PP+="/manifests/openstack_controller/openstack_controller.pp" ++ if [ -f ${CONTROLLER_PP} ]; then ++ sed -i.bak -r \ ++ 's/^(.*flavor-create.*m1\.micro auto)\s+[[:digit:]]+(.*)$/\1 128\2/' \ ++ ${CONTROLLER_PP} ++ echo "INFO: [64] => [128] updated m1.micro profile RAM size (MB)." ++ fi + fi + fi + -- cgit 1.2.3-korg