From 11484580d35c7310242303fa0728e3681462f37f Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 7 May 2019 13:31:04 -0400
Subject: Cirrus: Add support for testing F30

Remove disused `build_cache_images` task, and
update relevant dockerfiles for F30.

Fix problem of cloud-init failing to expand root-device on boot
(/var/lib/cloud/instance left in improper state).

Fix problem of cloud-init racing with google-network-daemon.service on
boot (looking for cloudconfig metadata too early).  Causing
root-device to _sometimes_ fail to expand.

Fix problem of hack/get_ci_vm.sh argument passing.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 Dockerfile.fedora | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Dockerfile.fedora')

diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index c34d4bb16..5cbc6e1fe 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -1,9 +1,8 @@
-FROM registry.fedoraproject.org/fedora:29
+FROM registry.fedoraproject.org/fedora:30
 
 RUN dnf -y install btrfs-progs-devel \
               atomic-registries \
               bzip2 \
-              conmon \
               device-mapper-devel \
               findutils \
               git \
-- 
cgit v1.2.3-54-g00ecf