diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-20 20:27:16 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-20 20:28:24 +0100 |
| commit | 34a6e8b25e46f5616739a535696a512f44f85bfc (patch) | |
| tree | a76a5192a025cb5b00b21a7a3570c881e955fce1 /patches/opnfv-fuel/upstream-backports | |
| parent | dd5550d06c6f714dc3a4db174b2bb006a5092206 (diff) | |
build: select_ubuntu_repo: break on err
Backport urgent fix [1] from Fuel@OPNFV to unbreak all CI
verify/build jobs in Armband.
[1] https://gerrit.opnfv.org/gerrit/#/c/26269/
Change-Id: Icf5a84b62eb39edd922ab98a45b2c26c478466f6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/upstream-backports')
| -rw-r--r-- | patches/opnfv-fuel/upstream-backports/0007-build-select_ubuntu_repo-break-on-err.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/upstream-backports/0007-build-select_ubuntu_repo-break-on-err.patch b/patches/opnfv-fuel/upstream-backports/0007-build-select_ubuntu_repo-break-on-err.patch new file mode 100644 index 00000000..fdf7be87 --- /dev/null +++ b/patches/opnfv-fuel/upstream-backports/0007-build-select_ubuntu_repo-break-on-err.patch @@ -0,0 +1,70 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 20 Dec 2016 00:49:47 +0100 +Subject: [PATCH] build: select_ubuntu_repo: break on err + +Stop ISO build process if no sane Ubuntu mirrors are available, +instead of continuing with an empty URL, which is bound to fail +later. + +While at it, skip re-assesing the output of select_ubuntu_repo.sh if +the URL var already is set. + +Also, stderr and stdout were both captured in UBUNTU_MIRROR_URL, +so disable debug by default, and only print debug info in case no +valid mirror is found. + +v2 -> v3: +- allow "One hour behind" mirror state to be considered, since + we already accept "Six hours behind" mirrors; + +JIRA: FUEL-240 + +Change-Id: I791942da234304528ff5cae1891415602e1a62b2 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/Makefile | 10 +++++++--- + build/f_isoroot/f_repobuild/select_ubuntu_repo.sh | 4 ++-- + 2 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/build/Makefile b/build/Makefile +index c8fc793..d4b981a 100644 +--- a/build/Makefile ++++ b/build/Makefile +@@ -51,9 +51,13 @@ export REPOINFO := $(BUILD_BASE)/repo_info.sh + + # Use snapshots + # Use nearby repositories +-export MIRROR_UBUNTU_URL := $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh --url) +-export MIRROR_UBUNTU := $(shell echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f3 ) +-export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f4-) ++export MIRROR_UBUNTU_URL ?= $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh) ++export MIRROR_UBUNTU ?= $(shell echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f3 ) ++export MIRROR_UBUNTU_ROOT ?= $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f4-) ++ifeq (,$(MIRROR_UBUNTU_URL)) ++$(warning $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh -d)) ++$(error No sane Ubuntu mirror available) ++endif + + export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py) + +diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +index 24bd422..5618eb7 100755 +--- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh ++++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +@@ -69,14 +69,14 @@ if [ "$1" == "-d" ]; then + fi + + # Hardcode for testing purposes +-DEBUG=1 ++# DEBUG=1 + + TMPFILE=$(mktemp /tmp/mirrorsXXXXX)A + trap cleanup exit + + # Generate a list of mirrors considered as "up" + curl -s https://launchpad.net/ubuntu/+archivemirrors | \ +- grep -P -B8 "statusUP|statusSIX" | \ ++ grep -P -B8 "statusUP|statusONE|statusSIX" | \ + grep -o -P "(f|ht)tp.*\"" | \ + sed 's/"$//' | sort | uniq > $TMPFILE + |