diff options
| -rw-r--r-- | build/Makefile | 41 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config.mk | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk | 2 | ||||
| -rwxr-xr-x | build/f_isoroot/f_repobuild/select_ubuntu_repo.sh | 63 | ||||
| -rw-r--r-- | build/patch-repos/0010-bootstrap_admin_node.sh.patch (renamed from build/bootstrap_admin_node.sh.patch) | 0 | ||||
| -rw-r--r-- | build/patch-repos/0020-isolinux.cfg.patch (renamed from build/isolinux.cfg.patch) | 0 | ||||
| -rw-r--r-- | build/patch-repos/0030-repo-multi-arch-local-mirrors.patch (renamed from build/repo-multi-arch-local-mirrors.patch) | 0 | ||||
| -rw-r--r-- | build/patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch (renamed from build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch) | 0 |
8 files changed, 40 insertions, 68 deletions
diff --git a/build/Makefile b/build/Makefile index fa708696e..59d9096c6 100644 --- a/build/Makefile +++ b/build/Makefile @@ -80,6 +80,11 @@ ORIGDIR := $(TOPDIR)/origiso # END of variables to customize ############################################################################# +# Fuel-main destination path and fuel-* submodule patching, for full list check: +# https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk#L32-L44 +FUEL_MAIN_DIR := /tmp/fuel-main +FUEL_PATCHES := $(shell find $(BUILD_BASE)/patch-repos -name '*.patch' | sort) + SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) .PHONY: all @@ -105,10 +110,10 @@ include cache.mk $(ISOCACHE): # Clone Fuel to non-persistent location and build - sudo rm -rf /tmp/fuel-main - cd /tmp && git clone $(FUEL_MAIN_REPO) - cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG) - @echo "fuel" `git -C /tmp/fuel-main rev-parse HEAD` >> $(VERSION_FILE) + sudo rm -rf $(FUEL_MAIN_DIR) + git clone $(FUEL_MAIN_REPO) $(FUEL_MAIN_DIR) + git -C $(FUEL_MAIN_DIR) checkout $(FUEL_MAIN_TAG) + @echo "fuel" `git -C $(FUEL_MAIN_DIR) rev-parse HEAD` >> $(VERSION_FILE) # Remove Docker optimizations, otherwise multistrap will fail during # Fuel build. sudo rm -f /etc/apt/apt.conf.d/docker* @@ -124,21 +129,23 @@ $(ISOCACHE): sudo service docker stop || exit 0 sudo service docker start - cd /tmp/fuel-main && ./prepare-build-env.sh + cd $(FUEL_MAIN_DIR) && ./prepare-build-env.sh # Verify that Docker is alive sudo docker info - cd /tmp/fuel-main && make repos - $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt + # fuel-main Makefiles do not like `make -C` + cd $(FUEL_MAIN_DIR) && make repos + $(REPOINFO) -r $(FUEL_MAIN_DIR) > gitinfo_fuel.txt # OPNFV patches at Fuel build time # Need to be commited in order for them to be considered by the Fuel # build system - cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch - cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch - cd /tmp/fuel-main/build/repos/fuel-nailgun && git am $(TOPDIR)/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch - cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch + $(foreach patch,$(FUEL_PATCHES),git \ + -C $(subst $(BUILD_BASE)/patch-repos,$(FUEL_MAIN_DIR),$(dir $(patch))) \ + am --whitespace=nowarn --committer-date-is-author-date $(patch) || \ + (echo 'Error: Failed patching Fuel repos!' ; exit 1);) + # Repeat build up to three times sudo -E ./fuel_build_loop - cp /tmp/fuel-main/build/artifacts/fuel*.iso . + cp $(FUEL_MAIN_DIR)/build/artifacts/fuel*.iso . # Store artifact in cache straight away if caching is enabled # (no .cacheid will be present unless this is a cached build) test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0 @@ -220,11 +227,11 @@ debug: # - The commit ID of the full Fuel repo structre # - The contents of all local Fuel patches .cacheid: - cd /tmp && git clone $(FUEL_MAIN_REPO) - cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG) - cd /tmp/fuel-main && make repos - $(REPOINFO) -r /tmp/fuel-main > .cachedata - sha1sum *.patch >> .cachedata + git clone $(FUEL_MAIN_REPO) $(FUEL_MAIN_DIR) + git -C $(FUEL_MAIN_DIR) checkout $(FUEL_MAIN_TAG) + make -C $(FUEL_MAIN_DIR) repos + $(REPOINFO) -r $(FUEL_MAIN_DIR) > .cachedata + $(foreach patch,$(FUEL_PATCHES),sha1sum $(patch) >> .cachedata;) sha1sum fuel_build_loop >> .cachedata sha1sum config.mk >> .cachedata sha1sum Makefile >> .cachedata diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 48e7f78fd..7672b0037 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -13,4 +13,4 @@ FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.gi export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz export ODL_VERSION_NUMBER?=0.4.3 -export ODL_BORON_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz +export ODL_BORON_TARBALL_LOCATION?=http://artifacts.opnfv.org/fuel/colorado/vendor/distribution-karaf-0.5.0-Boron-RC2.tar.gz diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk index 94557fe0d..a599ecc8c 100644 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -OVS_NSH_DPDK_BRANCH?=7d02f4c328e1f712bb2bb3eee0d77593f22b2fba +OVS_NSH_DPDK_BRANCH?=137748b828f03debe5ae1b40a4ee440b8f5e96f8 OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs OVS_NSH_DPDK_CHANGE?= diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index 4bca6bd9b..7b134e73c 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh @@ -1,67 +1,32 @@ #!/bin/bash ############################################################################## -# Copyright (c) 2015 Ericsson AB and others. +# 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 ############################################################################## -RSYNC="rsync -4 --contimeout 5 --no-motd --list-only" -# try to choose close ubuntu mirror which support rsync protocol -# https://bugs.launchpad.net/fuel/+bug/1459252 - -# A minor modificiation of Michal Skalski's original Makefile version -# to only consider repos where no repo updates are in progress (as -# that may have us hanging quite a while otherwise). If no suitable -# local mirror can be found after four attempts, the default archive -# is returned instead. +# Try to choose close ubuntu mirror # 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="mirrors.se.eu.kernel.org mirror.its.dal.ca" -return_url=0 - -while [ "$1" != "" ]; do - case $1 in - -u | --url ) shift - return_url=1 - ;; - # Shift all the parameters down by one - esac - shift -done - -cnt=0 -while [ $cnt -lt 4 ] +for url in $(curl -s http://mirrors.ubuntu.com/mirrors.txt) do - 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 $RSYNC "${host}::ubuntu/." &> /dev/null - then - if ! $RSYNC "${host}::ubuntu/Archive-Update-in-Progress*" &> /dev/null - then - if [ "$return_url" = "1" ]; then - echo "$url" - exit 0 - else - echo "$host" - exit 0 - fi - fi - fi - done - cnt=$[cnt + 1] - sleep 15 + 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 + else + continue + fi done -if [ "$return_url" = "1" ]; then - echo "http://archive.ubuntu.com/ubuntu/" -else - echo "archive.ubuntu.com" -fi +# If no suitable local mirror can be found, +# the default archive is returned instead. +echo "http://archive.ubuntu.com/ubuntu/" diff --git a/build/bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch index d3769adfb..d3769adfb 100644 --- a/build/bootstrap_admin_node.sh.patch +++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch diff --git a/build/isolinux.cfg.patch b/build/patch-repos/0020-isolinux.cfg.patch index f09be2a7f..f09be2a7f 100644 --- a/build/isolinux.cfg.patch +++ b/build/patch-repos/0020-isolinux.cfg.patch diff --git a/build/repo-multi-arch-local-mirrors.patch b/build/patch-repos/0030-repo-multi-arch-local-mirrors.patch index d40428743..d40428743 100644 --- a/build/repo-multi-arch-local-mirrors.patch +++ b/build/patch-repos/0030-repo-multi-arch-local-mirrors.patch diff --git a/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch b/build/patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch index d486f2354..d486f2354 100644 --- a/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch +++ b/build/patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch |