Browse code

Merge pull request #20202 from anusha-ragunathan/arm-dummy-interface

Add "dummy" network module for arm images.

Arnaud Porterie authored on 2016/02/12 12:02:25
Showing 1 changed files
... ...
@@ -80,6 +80,16 @@ binary: build
80 80
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary
81 81
 
82 82
 build: bundles
83
+ifeq ($(DOCKER_OSARCH), linux/arm)
84
+	# A few libnetwork integration tests require that the kernel be
85
+	# configured with "dummy" network interface and has the module
86
+	# loaded. However, the dummy module is not available by default
87
+	# on arm images. This ensures that it's built and loaded.
88
+	echo "Syncing kernel modules"
89
+	oc-sync-kernel-modules
90
+	depmod
91
+	modprobe dummy
92
+endif
83 93
 	docker build ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" .
84 94
 
85 95
 bundles: