diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-23 12:33:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-23 12:33:39 -0800 |
| commit | 78604c3c397068f70ccb5e8b4be4b9229e2072fb (patch) | |
| tree | f776726339ac8a9adb6ef3cac68ce1fb6a2ed1a6 | |
| parent | 1fdfeb87100aee82d4de17b2b3f9a81aedfcb6a8 (diff) | |
| parent | 90412e4c56b72efb4bdbb26fc45c1383f51db46a (diff) | |
| download | podman-78604c3c397068f70ccb5e8b4be4b9229e2072fb.tar.gz podman-78604c3c397068f70ccb5e8b4be4b9229e2072fb.tar.bz2 podman-78604c3c397068f70ccb5e8b4be4b9229e2072fb.zip | |
Merge pull request #1858 from adrianreber/papr
Load NAT modules to fix tests involving CRIU
| -rw-r--r-- | .papr_prepare.sh | 7 |
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 |