From d1c44ea8560c59d843f8550005050a5e09e2b062 Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 30 May 2019 10:56:21 -0500 Subject: split rootless local and remote testing Signed-off-by: baude --- contrib/cirrus/setup_container_environment.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'contrib/cirrus/setup_container_environment.sh') diff --git a/contrib/cirrus/setup_container_environment.sh b/contrib/cirrus/setup_container_environment.sh index eda6f6167..c268c162e 100755 --- a/contrib/cirrus/setup_container_environment.sh +++ b/contrib/cirrus/setup_container_environment.sh @@ -5,9 +5,6 @@ source $(dirname $0)/lib.sh req_env_var GOSRC OS_RELEASE_ID CONTAINER_RUNTIME -DIST=$OS_RELEASE_ID -IMAGE=${DIST}podmanbuild - # 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 @@ -15,5 +12,5 @@ IMAGE=${DIST}podmanbuild modprobe ip6table_nat || : modprobe iptable_nat || : -# Build the test image -${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . +# Pull the test image +${CONTAINER_RUNTIME} pull ${IN_PODMAN_IMAGE} -- cgit v1.2.3-54-g00ecf