summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Reber <areber@redhat.com>2018-11-23 15:18:58 +0000
committerAdrian Reber <adrian@lisas.de>2018-11-23 19:09:48 +0100
commit90412e4c56b72efb4bdbb26fc45c1383f51db46a (patch)
treef776726339ac8a9adb6ef3cac68ce1fb6a2ed1a6
parent1fdfeb87100aee82d4de17b2b3f9a81aedfcb6a8 (diff)
downloadpodman-90412e4c56b72efb4bdbb26fc45c1383f51db46a.tar.gz
podman-90412e4c56b72efb4bdbb26fc45c1383f51db46a.tar.bz2
podman-90412e4c56b72efb4bdbb26fc45c1383f51db46a.zip
Load NAT modules to fix tests involving CRIU
CRIU uses iptables to lock and unlock the network during checkpoint and restore. If Podman is running in Podman the automatic loading of modules does not work and thus this commit pre-loads the necessary modules to make sure the checkpoint test cases are not failing. Signed-off-by: Adrian Reber <areber@redhat.com>
-rw-r--r--.papr_prepare.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/.papr_prepare.sh b/.papr_prepare.sh
index e0657dcd2..5d7d21530 100644
--- a/.papr_prepare.sh
+++ b/.papr_prepare.sh
@@ -10,6 +10,13 @@ if [[ ${DIST} != "Fedora" ]]; then
PYTHON=python
fi
+# Since CRIU 3.11 has been pushed to Fedora 28 the checkpoint/restore
+# test cases are actually run. As CRIU uses iptables to lock and unlock
+# the network during checkpoint and restore it needs the following two
+# modules loaded.
+modprobe ip6table_nat || :
+modprobe iptable_nat || :
+
# Build the test image
${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log