From 8d54e4855c386e6805c8e84dc36330006e2d4787 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
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 <cevich@redhat.com>
---
 contrib/cirrus/lib.sh                     |  5 +++--
 contrib/cirrus/packer/ubuntu_packaging.sh | 12 +++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'contrib')

diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index f1e542e74..cc5a3ffa7 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -63,8 +63,9 @@ CIRRUS_BUILD_ID=${CIRRUS_BUILD_ID:-$RANDOM$(date +%s)}  # must be short and uniq
 PACKER_VER="1.4.2"
 # CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json)
 
-# Base-images rarely change, define them here so they're out of the way.
-export PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-18,ubuntu-19,fedora-32,fedora-31}"
+# List of cache imaes to build for 'CI:IMG' mode via build_vm_images.sh
+# Exists to support manual single-image building in case of emergency
+export PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-20,ubuntu-19,fedora-32,fedora-31}"
 # Google cloud provides these, we just make copies (see $SCRIPT_BASE/README.md) for use
 export UBUNTU_BASE_IMAGE="ubuntu-2004-focal-v20200506"
 export PRIOR_UBUNTU_BASE_IMAGE="ubuntu-1910-eoan-v20200211"
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