summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/Makefile2
-rw-r--r--build/f_isoroot/f_odlpluginbuild/Makefile2
-rw-r--r--build/f_isoroot/f_qemupluginbuild/config.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/build/Makefile b/build/Makefile
index 01f6e414a..a76c44ee2 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -85,7 +85,7 @@ all:
KERNEL_VER="$${KERNEL_VER%.*-*}"; \
KERNEL_VER="$${KERNEL_VER//.}"; \
[ $$KERNEL_VER -ge 319 ] || (echo 'Kernel version must be 3.19 or newer'; exit 1)
- @docker/runcontext $(DOCKERIMG) ping -c 1 www.google.com > /dev/null 2>&1 || (echo 'No docker network connectivity or name server - check your network- and docker settings'; exit 1)
+ @docker/runcontext $(DOCKERIMG) wget -q www.google.com > /dev/null 2>&1 || (echo 'No docker network connectivity or name server - check your network- and docker settings'; exit 1)
@docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index 5287ca8aa..5e563ff33 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -8,7 +8,7 @@
##############################################################################
TOP := $(shell pwd)
-ODL_BRANCH=brahmaputra-release
+ODL_BRANCH=brahmaputra-sr2
ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
export USE_JAVA8=true
diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
index e4a7d393f..1f823b689 100644
--- a/build/f_isoroot/f_qemupluginbuild/config.mk
+++ b/build/f_isoroot/f_qemupluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-QEMU_BRANCH=1eb8bf930e2ec6e64526e95fcb21124f7401a243
+QEMU_BRANCH=fc2f266fc0986b56deb0b740a5e202205b577a60
QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
QEMU_CHANGE=