summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2018-10-08 10:50:57 -0400
committerChris Evich <cevich@redhat.com>2018-10-31 09:48:30 -0400
commit4929662c8a3154fb002ddb3c943e776c755ec89a (patch)
tree562f6db59a24201d91f01c7f1826582c2e27535a /contrib/cirrus
parentcf4288e3cc1cd95e512cae063066ca26917e378e (diff)
downloadpodman-4929662c8a3154fb002ddb3c943e776c755ec89a.tar.gz
podman-4929662c8a3154fb002ddb3c943e776c755ec89a.tar.bz2
podman-4929662c8a3154fb002ddb3c943e776c755ec89a.zip
Ubuntu VM image build: try update twice
Occasionally, short-term temporary connectivity problems prevent ubuntu from updating on GCE. As a workaround, attempt these commands twice. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index ff20944dc..4cf1f335b 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -21,9 +21,10 @@ install_ooe
export GOPATH="$(mktemp -d)"
trap "sudo rm -rf $GOPATH" EXIT
-ooe.sh sudo apt-get -qq update
-ooe.sh sudo apt-get -qq update # sometimes it needs to get it twice :S
-ooe.sh sudo apt-get -qq upgrade
+# 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 \
apparmor \
autoconf \