From 8d54e4855c386e6805c8e84dc36330006e2d4787 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 13 May 2020 10:48:21 -0400 Subject: Cirrus: Fix image-name hints This properly prints out image-name hints when executing the hack script without any arguments. It is required due to changes made by Ed for test-name beatification. An identical change was made and reviewed by Ed in the containers/storage repo. Signed-off-by: Chris Evich --- contrib/cirrus/packer/ubuntu_packaging.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'contrib/cirrus/packer/ubuntu_packaging.sh') diff --git a/contrib/cirrus/packer/ubuntu_packaging.sh b/contrib/cirrus/packer/ubuntu_packaging.sh index d9d212494..fd0280230 100644 --- a/contrib/cirrus/packer/ubuntu_packaging.sh +++ b/contrib/cirrus/packer/ubuntu_packaging.sh @@ -98,8 +98,6 @@ INSTALL_PACKAGES=(\ podman protobuf-c-compiler protobuf-compiler - python-future - python-minimal python-protobuf python3-dateutil python3-pip @@ -117,11 +115,19 @@ INSTALL_PACKAGES=(\ vim wget xz-utils - yum-utils zip zlib1g-dev ) +# These aren't resolvable on Ubuntu 20 +if [[ "$OS_RELEASE_VER" -le 19 ]]; then + INSTALL_PACKAGES+=(\ + python-future + python-minimal + yum-utils + ) +fi + # Do this at the last possible moment to avoid dpkg lock conflicts echo "Upgrading all packages" $BIGTO ooe.sh $SUDOAPTGET upgrade -- cgit v1.2.3-54-g00ecf