Merge pull request #7138 from cevich/add_python_packages

Cirrus: Add python packages to images

1 files changed, 15 insertions, 7 deletions

diff --git a/contrib/cirrus/packer/fedora_packaging.sh b/contrib/cirrus/packer/fedora_packaging.sh
index f19932a9f..4a8f62e45 100644
--- a/contrib/cirrus/packer/fedora_packaging.sh
+++ b/contrib/cirrus/packer/fedora_packaging.sh
@@ -26,7 +26,7 @@ source /usr/share/automation/environment
 # Set this to 1 to NOT enable updates-testing repository
 DISABLE_UPDATES_TESTING=${DISABLE_UPDATES_TESTING:0}
 
-# Do not enable update-stesting on the previous Fedora release
+# Do not enable updates-testing on the previous Fedora release
 if ((DISABLE_UPDATES_TESTING!=0)); then
     warn "Enabling updates-testing repository for image based on $FEDORA_BASE_IMAGE"
     $LILTO $SUDO ooe.sh dnf install -y 'dnf-command(config-manager)'
@@ -37,7 +37,15 @@ fi
 
 $BIGTO ooe.sh $SUDO dnf update -y
 
+# Fedora, as of 31, uses cgroups v2 by default. runc does not support
+# cgroups v2, only crun does. (As of 2020-07-30 runc support is
+# forthcoming but not even close to ready yet). To ensure a reliable
+# runtime environment, force-remove runc if it is present.
+# However, because a few other repos. which use these images still need
+# it, ensure the runc package is cached in $PACKAGE_DOWNLOAD_DIR so
+# it may be swap it in when required.
 REMOVE_PACKAGES=(runc)
+
 INSTALL_PACKAGES=(\
     autoconf
     automake
@@ -118,11 +126,12 @@ INSTALL_PACKAGES=(\
     python2
     python3-PyYAML
     python3-dateutil
-    python3-psutil
-    python3-pytoml
-    python3-libsemanage
     python3-libselinux
+    python3-libsemanage
     python3-libvirt
+    python3-psutil
+    python3-pytoml
+    python3-requests
     redhat-rpm-config
     rpcbind
     rsync
@@ -163,7 +172,7 @@ $BIGTO ooe.sh $SUDO dnf install -y ${INSTALL_PACKAGES[@]}
 #   $BIGTO ooe.sh $SUDO dnf --enablerepo=updates-testing -y upgrade crun
 
 [[ ${#REMOVE_PACKAGES[@]} -eq 0 ]] || \
-    $LILTO ooe.sh $SUDO dnf erase -y ${REMOVE_PACKAGES[@]}
+    $LILTO ooe.sh $SUDO dnf erase -y "${REMOVE_PACKAGES[@]}"
 
 if [[ ${#DOWNLOAD_PACKAGES[@]} -gt 0 ]]; then
     echo "Downloading packages for optional installation at runtime, as needed."
@@ -171,8 +180,7 @@ if [[ ${#DOWNLOAD_PACKAGES[@]} -gt 0 ]]; then
     ooe.sh $SUDO dnf -y module enable cri-o:$(get_kubernetes_version)
     $SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
     cd "$PACKAGE_DOWNLOAD_DIR"
-    $LILTO ooe.sh $SUDO dnf download -y --resolve ${DOWNLOAD_PACKAGES[@]}
-    ls -la "$PACKAGE_DOWNLOAD_DIR/"
+    $LILTO ooe.sh $SUDO dnf download -y --resolve "${DOWNLOAD_PACKAGES[@]}"
 fi
 
 echo "Installing runtime tooling"