diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-01 06:36:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-01 06:36:51 -0800 |
| commit | 41f250c4861b9950b63dc7501211d13b6e0bd5ed (patch) | |
| tree | 088715bf479c5c49f058520ec590054f514535a9 /contrib/cirrus/packer | |
| parent | 6b8f89d07447959635fa0c345933cd4fbadc9682 (diff) | |
| parent | deeb3eaf7dde436fd23f8bcb03d30021e2b27c0b (diff) | |
| download | podman-41f250c4861b9950b63dc7501211d13b6e0bd5ed.tar.gz podman-41f250c4861b9950b63dc7501211d13b6e0bd5ed.tar.bz2 podman-41f250c4861b9950b63dc7501211d13b6e0bd5ed.zip | |
Merge pull request #1903 from giuseppe/fix-rootless-tests
tests: fix rootless tests on Ubuntu
Diffstat (limited to 'contrib/cirrus/packer')
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 4cf1f335b..ef209a4a4 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -21,11 +21,13 @@ install_ooe export GOPATH="$(mktemp -d)" trap "sudo rm -rf $GOPATH" EXIT +export DEBIAN_FRONTEND=noninteractive + # Try twice as workaround for minor networking problems echo "Updating system and installing package dependencies" -ooe.sh sudo apt-get -qq update || sudo apt-get -qq update -ooe.sh sudo apt-get -qq upgrade || sudo apt-get -qq upgrade -ooe.sh sudo apt-get -qq install --no-install-recommends \ +ooe.sh sudo -E apt-get -qq update || sudo -E apt-get -qq update +ooe.sh sudo -E apt-get -qq upgrade || sudo -E apt-get -qq upgrade +ooe.sh sudo -E apt-get -qq install --no-install-recommends \ apparmor \ autoconf \ automake \ |