From 038aa7ac3167bd9f9cb579766abfd6fb650107eb Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 10 May 2016 22:37:48 +0200 Subject: Cleanup: rm TODO, fix license header. While we're at it, fix default setting for net.ifnames in arm64 fixture. Also, renumber some patches to eliminate duplicate prefixes resulted from parallel development of patch sets. Change-Id: Ibd8cc1f6f8916ad79527f2060a1a2725d557b2c2 (cherry picked from commit 93f6b4a3da5772c0a1d3d0d13f4ea5e024985488) --- ...build-Repeat-mirror-build-up-to-ten-times.patch | 73 ---------------------- ...date-bootstrap-target-build-time-estimate.patch | 33 ---------- ...build-Repeat-mirror-build-up-to-ten-times.patch | 73 ++++++++++++++++++++++ ...date-bootstrap-target-build-time-estimate.patch | 33 ++++++++++ 4 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 patches/opnfv-fuel/0026-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch delete mode 100644 patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch create mode 100644 patches/opnfv-fuel/0028-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch create mode 100644 patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch (limited to 'patches/opnfv-fuel') diff --git a/patches/opnfv-fuel/0026-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch b/patches/opnfv-fuel/0026-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch deleted file mode 100644 index 0b1f92f1..00000000 --- a/patches/opnfv-fuel/0026-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Alexandru Avadanii -Date: Sun, 8 May 2016 22:37:43 +0200 -Subject: [PATCH] f_repobuild: Repeat mirror build up to ten times. - -OPNFV ISO build uses fuel-mirror to create a local Ubuntu -partial mirror in nailgun. - -Work around temporary mirror issue (e.g. during rsync) by -retrying mirror build up to 10 times. - -Signed-off-by: Alexandru Avadanii ---- - build/f_isoroot/f_repobuild/Makefile | 6 +++++- - build/f_isoroot/f_repobuild/fuel_mirror_loop | 26 ++++++++++++++++++++++++++ - 2 files changed, 31 insertions(+), 1 deletion(-) - create mode 100755 build/f_isoroot/f_repobuild/fuel_mirror_loop - -diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile -index 5e7157b..9abe9bb 100644 ---- a/build/f_isoroot/f_repobuild/Makefile -+++ b/build/f_isoroot/f_repobuild/Makefile -@@ -23,6 +23,9 @@ export OPENSTACK_VERSION - .PHONY: all - all: nailgun - -+nailgun_mirror: -+ sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu -+ - nailgun: - sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml - # python-debian from Ubuntu can't parse foreign arch relationships, use pip -@@ -35,7 +38,8 @@ nailgun: - sudo pip install ./fuel-mirror - sudo pip install ./fuel-mirror/contrib/fuel_mirror - ./opnfv_mirror_conf.py -- sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu -+ # Repeat mirror build up to ten times -+ sudo -E ./fuel_mirror_loop - sudo chmod -R 755 /var/www/nailgun - cp -Rp /var/www/nailgun . - # On the end we want to have ubuntu repository in mirrors/ubuntu directory -diff --git a/build/f_isoroot/f_repobuild/fuel_mirror_loop b/build/f_isoroot/f_repobuild/fuel_mirror_loop -new file mode 100755 -index 0000000..f123cf2 ---- /dev/null -+++ b/build/f_isoroot/f_repobuild/fuel_mirror_loop -@@ -0,0 +1,26 @@ -+#!/bin/bash -+############################################################################## -+# Copyright (c) 2016 Ericsson AB and others. -+# Copyright (c) 2016 Enea AB and others. -+# 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 -+############################################################################## -+ -+maxcount=10 -+cnt=0 -+rc=1 -+while [ $cnt -lt $maxcount ] && [ $rc -ne 0 ] -+do -+ cnt=$[cnt + 1] -+ echo -e "\n\n\n*** Starting mirror build attempt # $cnt" -+ make nailgun_mirror -+ rc=$? -+ if [ $rc -ne 0 ]; then -+ echo "### Mirror build failed with rc $rc ###" -+ else -+ echo "### Mirror build successful at attempt # $cnt" -+ fi -+done -+exit $rc diff --git a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch deleted file mode 100644 index 9791f595..00000000 --- a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 ---- - build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh -index 744f352..7395af3 100755 ---- a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh -+++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh -@@ -29,9 +29,12 @@ and added to cluster. \ - For more information please visit \ - https://docs.mirantis.com/openstack/fuel/fuel-master/" - 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. Please reboot failed to discover nodes \ --after bootstrap image become available." -+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. Please reboot \ -+failed to discover nodes after bootstrap image become available." -+ - 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" diff --git a/patches/opnfv-fuel/0028-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch b/patches/opnfv-fuel/0028-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch new file mode 100644 index 00000000..0b1f92f1 --- /dev/null +++ b/patches/opnfv-fuel/0028-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch @@ -0,0 +1,73 @@ +From: Alexandru Avadanii +Date: Sun, 8 May 2016 22:37:43 +0200 +Subject: [PATCH] f_repobuild: Repeat mirror build up to ten times. + +OPNFV ISO build uses fuel-mirror to create a local Ubuntu +partial mirror in nailgun. + +Work around temporary mirror issue (e.g. during rsync) by +retrying mirror build up to 10 times. + +Signed-off-by: Alexandru Avadanii +--- + build/f_isoroot/f_repobuild/Makefile | 6 +++++- + build/f_isoroot/f_repobuild/fuel_mirror_loop | 26 ++++++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) + create mode 100755 build/f_isoroot/f_repobuild/fuel_mirror_loop + +diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile +index 5e7157b..9abe9bb 100644 +--- a/build/f_isoroot/f_repobuild/Makefile ++++ b/build/f_isoroot/f_repobuild/Makefile +@@ -23,6 +23,9 @@ export OPENSTACK_VERSION + .PHONY: all + all: nailgun + ++nailgun_mirror: ++ sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu ++ + nailgun: + sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml + # python-debian from Ubuntu can't parse foreign arch relationships, use pip +@@ -35,7 +38,8 @@ nailgun: + sudo pip install ./fuel-mirror + sudo pip install ./fuel-mirror/contrib/fuel_mirror + ./opnfv_mirror_conf.py +- sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu ++ # Repeat mirror build up to ten times ++ sudo -E ./fuel_mirror_loop + sudo chmod -R 755 /var/www/nailgun + cp -Rp /var/www/nailgun . + # On the end we want to have ubuntu repository in mirrors/ubuntu directory +diff --git a/build/f_isoroot/f_repobuild/fuel_mirror_loop b/build/f_isoroot/f_repobuild/fuel_mirror_loop +new file mode 100755 +index 0000000..f123cf2 +--- /dev/null ++++ b/build/f_isoroot/f_repobuild/fuel_mirror_loop +@@ -0,0 +1,26 @@ ++#!/bin/bash ++############################################################################## ++# Copyright (c) 2016 Ericsson AB and others. ++# Copyright (c) 2016 Enea AB and others. ++# 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 ++############################################################################## ++ ++maxcount=10 ++cnt=0 ++rc=1 ++while [ $cnt -lt $maxcount ] && [ $rc -ne 0 ] ++do ++ cnt=$[cnt + 1] ++ echo -e "\n\n\n*** Starting mirror build attempt # $cnt" ++ make nailgun_mirror ++ rc=$? ++ if [ $rc -ne 0 ]; then ++ echo "### Mirror build failed with rc $rc ###" ++ else ++ echo "### Mirror build successful at attempt # $cnt" ++ fi ++done ++exit $rc diff --git a/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch new file mode 100644 index 00000000..9791f595 --- /dev/null +++ b/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch @@ -0,0 +1,33 @@ +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 +--- + build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh +index 744f352..7395af3 100755 +--- a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh ++++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh +@@ -29,9 +29,12 @@ and added to cluster. \ + For more information please visit \ + https://docs.mirantis.com/openstack/fuel/fuel-master/" + 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. Please reboot failed to discover nodes \ +-after bootstrap image become available." ++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. Please reboot \ ++failed to discover nodes after bootstrap image become available." ++ + 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" -- cgit 1.2.3-korg