From e282c88d2ce8751f1230ee582072fd51a5d31a7b Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 3 Mar 2020 11:43:52 -0500
Subject: Cirrus: More Ubuntu 19 + Fedora 31

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml                           | 71 +++++++----------------------------
 contrib/cirrus/packer/ubuntu_setup.sh | 12 +++---
 2 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 016ef8f2b..f6b48270d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -401,16 +401,16 @@ testing_task:
         - name: "test ${FEDORA_NAME}"
           gce_instance:
               image_name: "${FEDORA_CACHE_IMAGE_NAME}"
-        # FIXME
-        #- name: "test ${PRIOR_FEDORA_NAME}"
-        #  gce_instance:
-        #      image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
-        # Multiple test failures on Ubuntu 19 - Fixes TBD in future PR
-        # TODO: image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
-        # FIXME
-        #- name: "test ${PRIOR_UBUNTU_NAME}"
-        #  gce_instance:
-        #      image_name: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
+        # TODO:
+        # - name: "test ${PRIOR_FEDORA_NAME}"
+        #   gce_instance:
+        #       image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
+        # - name: "test ${UBUNTU_CACHE_IMAGE_NAME}"
+        #   gce_instance:
+        #       image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
+        # - name: "test ${PRIOR_UBUNTU_NAME}"
+        #   gce_instance:
+        #       image_name: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
 
     timeout_in: 120m
 
@@ -554,21 +554,17 @@ special_testing_in_podman_task:
         $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
 
     matrix:
-        # FIXME: Integration testing currently broken for F31 hosts
-        # Error: container_linux.go:345: starting container process caused "process_linux.go:281: applying cgroup configuration for process caused \"mountpoint for cgroup not found\"": OCI runtime error
-        # image_name: "${FEDORA_CACHE_IMAGE_NAME}"
         - name: "in-podman ${PRIOR_FEDORA_NAME}"
           gce_instance:
               image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
+        - name: "in-podman ${FEDORA_CACHE_IMAGE_NAME}"
+          gce_instance:
+              image_name: "${FEDORA_CACHE_IMAGE_NAME}"
 
     env:
         ADD_SECOND_PARTITION: 'true'
         MOD_LIBPOD_CONF: 'false'  # Use existing/native setup
         SPECIALMODE: 'in_podman'  # See docs
-        # TODO: Support both runc and crun (cgroups v1 and v2 container images)
-        # matrix:
-        #   IN_PODMAN_IMAGE: "quay.io/libpod/in_podman:latest"
-        #   IN_PODMAN_IMAGE: "quay.io/libpod/in_podman_cgv2:latest"
 
     timeout_in: 60m
 
@@ -761,47 +757,6 @@ verify_test_built_images_task:
         <<: *standardlogs
 
 
-#test_building_snap_task:
-#
-#    depends_on:
-#        - "gating"
-#
-#    only_if: >-
-#        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-#        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-#
-#    container:
-#        image: yakshaveinc/snapcraft:core18
-#    snapcraft_script:
-#        - 'apt-get -y update'
-#        - 'cd contrib/snapcraft && snapcraft'
-#
-#
-#upload_snap_task:
-#    only_if: >-
-#        $CIRRUS_BRANCH != $DEST_BRANCH &&
-#        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-#        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-#
-#    # Only when PR or branch is merged into master
-#
-#    depends_on:
-#        - "test_building_snap"
-#
-#    container:
-#        image: yakshaveinc/snapcraft:core18
-#
-#    env:
-#        SNAPCRAFT_LOGIN: ENCRYPTED[d8e82eb31c6372fec07f405f413d57806026b1a9f8400033531ebcd54d6750a5e4a8b1f68e3ec65c98c65e0d9b2a6a75]
-#    snapcraft_login_file:
-#        path: /root/.snapcraft/login.cfg
-#        variable_name: SNAPCRAFT_LOGIN
-#    snapcraft_script:
-#        - 'apt-get -y update'
-#        - 'snapcraft login --with "/root/.snapcraft/login.cfg"'
-#        - 'cd contrib/snapcraft && snapcraft && snapcraft push *.snap --release edge'
-
-
 docs_task:
 
     # Don't run this when building/testing new VM images
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 46e7a620f..6bcf7d5f3 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -145,12 +145,6 @@ else
         /tmp/$(basename $BATS_URL)
         btrfs-tools
     )
-
-    echo "Forced Ubuntu 18 kernel to enable cgroup swap accounting."
-    SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g'
-    ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub.d/*
-    ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub
-    ooe.sh sudo update-grub
 fi
 
 echo "Installing general testing and system dependencies"
@@ -174,6 +168,12 @@ then
     sudo ln -f "$CRIO_RUNC_PATH" "/usr/bin/runc"
 fi
 
+echo "Making Ubuntu kernel to enable cgroup swap accounting as it is not the default."
+SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g'
+ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub.d/*
+ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub
+ooe.sh sudo update-grub
+
 ubuntu_finalize
 
 echo "SUCCESS!"
-- 
cgit v1.2.3-54-g00ecf