diff options
Diffstat (limited to 'build/f_isoroot/f_repobuild')
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile | 11 | ||||
| -rw-r--r-- | build/f_isoroot/f_repobuild/config.mk | 13 | ||||
| -rwxr-xr-x | build/f_isoroot/f_repobuild/select_ubuntu_repo.sh | 128 |
3 files changed, 100 insertions, 52 deletions
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index 7c6b16304..8beb8824f 100644 --- a/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile @@ -13,7 +13,6 @@ TOP := $(shell pwd) TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2) include ../../config.mk -include config.mk export MOS_VERSION export OPENSTACK_VERSION @@ -25,8 +24,7 @@ nailgun: sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml rm -Rf nailgun sudo mkdir -p /var/www/nailgun - git clone $(FUEL_MIRROR_REPO) - cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT) + ln -sf ${F_SUBMOD_DIR}/fuel-mirror fuel-mirror sudo pip install -U -r ./fuel-mirror/requirements.txt sudo pip install ./fuel-mirror sudo pip install ./fuel-mirror/contrib/fuel_mirror @@ -34,7 +32,7 @@ nailgun: sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu 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 + # In the end we want to have ubuntu repository in mirrors/ubuntu directory -if [ "$(MIRROR_UBUNTU_ROOT)" != "/ubuntu/" ]; then \ mkdir -p nailgun/mirrors/ubuntu;\ mv nailgun/mirrors$(MIRROR_UBUNTU_ROOT)* nailgun/mirrors/ubuntu;\ @@ -55,9 +53,9 @@ release:nailgun @cp -Rp nailgun ../release/opnfv/nailgun @cp fuel_bootstrap_cli.yaml ../release/opnfv/ -############################################################################# +############################################################################ # Cache operations - only used when building through ci/build.sh -############################################################################# +############################################################################ # Create a unique hash to be used for getting and putting cache, based on: # - Year and week (causing the cache to be rebuilt weekly) @@ -65,7 +63,6 @@ release:nailgun .cacheid: date +"Repocache %G%V" > .cachedata sha1sum Makefile >> .cachedata - sha1sum config.mk >> .cachedata $(CACHETOOL) packages >> .cachedata echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata cat .cachedata | $(CACHETOOL) getid > .cacheid diff --git a/build/f_isoroot/f_repobuild/config.mk b/build/f_isoroot/f_repobuild/config.mk deleted file mode 100644 index d81732849..000000000 --- a/build/f_isoroot/f_repobuild/config.mk +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# Copyright (c) 2016 Ericsson AB and others. -# mskalski@mirantis.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 -############################################################################## - -FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror -# Point to the commit where 302 redirects are handled -# https://bugs.launchpad.net/fuel/mitaka/+bug/1593674 -FUEL_MIRROR_COMMIT?=192a3d9f8f993afb12c5108dd9339c6688c23e11 diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index c3bb5cf36..24bd42234 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh @@ -1,38 +1,102 @@ #!/bin/bash -############################################################################## -# Copyright (c) 2015,2016 Ericsson AB and others. -# mskalski@mirantis.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 -############################################################################## - -# Try to choose close ubuntu mirror from mirrors.txt, but "whitewash" this -# against the full repo list to removed mirrors not up-to-date. - -# Some Ubuntu mirrors seem less reliable for this type of mirroring - -# as they are discoved they can be added to the blacklist below in order -# for them not to be considered. -BLACKLIST="mirror.clibre.uqam.ca" - -for url in $((curl -s https://launchpad.net/ubuntu/+archivemirrors | \ - grep -P -B8 "statusUP|statusSIX" | \ - grep -o -P "(f|ht)tp.*\"" | \ - sed 's/"$//' | sort | uniq; \ - curl -s http://mirrors.ubuntu.com/mirrors.txt | sort | uniq) | \ - sort | uniq -d) + +BLACKLIST="http://mirrors.se.eu.kernel.org/ubuntu/" +#BLACKLIST+=" http://foo.bar" + +cleanup() { + rm -f $TMPFILE +} + +debugmsg() { + test -n "$DEBUG" && echo "$@" >&2 +} + + +# Check if url is blacklisted in this script +blacklisted () { + for blackurl in $BLACKLIST + do + if [ "$1" == "$blackurl" ]; then + return 0 + fi + done + return 1 +} + + +# Check mirror's integrity +check_mirror () { + mirror=$1 + status=0 + for packdir in dists/trusty-updates/main/binary-amd64 \ + dists/trusty-updates/restricted/binary-amd64 \ + dists/trusty-updates/universe/binary-amd64 \ + dists/trusty-updates/multiverse/binary-amd64 \ + dists/trusty-security/main/binary-amd64 \ + dists/trusty-security/restricted/binary-amd64 \ + dists/trusty-security/universe/binary-amd64 \ + dists/trusty-security/multiverse/binary-amd64 \ + dists/trusty-proposed/main/binary-amd64 \ + dists/trusty-proposed/restricted/binary-amd64 \ + dists/trusty-proposed/universe/binary-amd64 \ + dists/trusty-proposed/multiverse/binary-amd64 \ + dists/trusty/main/binary-amd64 \ + dists/trusty/restricted/binary-amd64 \ + dists/trusty/universe/binary-amd64 \ + dists/trusty/multiverse/binary-amd64 \ + dists/trusty-backports/main/binary-amd64 \ + dists/trusty-backports/restricted/binary-amd64 \ + dists/trusty-backports/universe/binary-amd64 \ + dists/trusty-backports/multiverse/binary-amd64 + do + for packfile in Release Packages.gz + do + if [ $status -ne 1 ]; then + curl --output /dev/null --silent --head --fail \ + $mirror/$packdir/$packfile + if [ $? -ne 0 ]; then + debugmsg "$mirror: Faulty (at least missing $packdir/$packfile)" + status=1 + fi + fi + done + done + return $status +} + +if [ "$1" == "-d" ]; then + DEBUG=1 +fi + +# Hardcode for testing purposes +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 -o -P "(f|ht)tp.*\"" | \ + sed 's/"$//' | sort | uniq > $TMPFILE + +# Iterate over "close" mirror, check that they are considered up +# and sane. +for url in $(curl -s http://mirrors.ubuntu.com/mirrors.txt) do - host=$(echo $url | cut -d'/' -f3) - echo ${BLACKLIST} | grep -q ${host} && continue - if curl -s -o /dev/null --head --fail "$url"; then - echo $url - exit 0 + if ! grep -q $url $TMPFILE; then + debugmsg "$url Faulty (detected by Ubuntu)" + elif blacklisted $url; then + debugmsg "$url blacklisted" + elif [ -z $BESTURL ]; then + if grep -q $url $TMPFILE && check_mirror $url; then + debugmsg "$url: OK (setting as primary URL)" + BESTURL=$url + test -z "$DEBUG" && break + fi else - continue + grep -q $url $TMPFILE && check_mirror $url && debugmsg "$url: OK" fi done -# If no suitable local mirror can be found, -# the default archive is returned instead. -echo "http://archive.ubuntu.com/ubuntu/" +echo "$BESTURL" |