diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 10 | ||||
| -rw-r--r-- | build/f_isoroot/Makefile | 2 | ||||
| -rwxr-xr-x | build/f_isoroot/f_repobuild/select_ubuntu_repo.sh | 4 | ||||
| -rw-r--r-- | build/f_isoroot/f_yardstick-pluginbuild/config.mk | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/build/Makefile b/build/Makefile index c8fc79385..d4b981a9d 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/Makefile b/build/f_isoroot/Makefile index e189e1697..a011000a3 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild +PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild export PLUGINS NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index 24bd42234..5618eb79b 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 diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk index 88b1ea604..6cf00b74c 100644 --- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk +++ b/build/f_isoroot/f_yardstick-pluginbuild/config.mk @@ -8,6 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -YARDSTICK_BRANCH?=86b9fc4f434c72bd276e4bf1ce7d7f5a04b150b2 +YARDSTICK_BRANCH?=0e23c697e6329a57ba168cc57886b436ea87cdc4 YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git YARDSTICK_CHANGE?= |