Merge pull request #5518 from jmarrero/ci-fix2

cgwalters · web-flow · commit d92a54aab76b · 2025-10-26T11:39:57.000-04:00
tests: Increase disk size for container-image test
diff --git a/ci/prow/fcos-e2e.sh b/ci/prow/fcos-e2e.sh
@@ -6,11 +6,26 @@ set -xeuo pipefail
 export COSA_SKIP_OVERLAY=1
 # And suppress depcheck since we didn't install via RPM
 export COSA_SUPPRESS_DEPCHECK=1
+
 ls -al /usr/bin/rpm-ostree
 rpm-ostree --version
 cd $(mktemp -d)
+
+# Let's force XDG vars to make sure we got permissions
+# when writing to the directories
+# https://specifications.freedesktop.org/basedir-spec/latest/
+mkdir -p "$PWD/.state" "$PWD/.cache" "$PWD/.config"
+chmod 700 "$PWD/.state" "$PWD/.config"
+chmod 755 "$PWD/.cache"
+export XDG_STATE_HOME="$PWD/.state"
+export XDG_CACHE_HOME="$PWD/.cache"
+export XDG_CONFIG_HOME="$PWD/.config"
+
 cosa init https://github.com/coreos/fedora-coreos-config/
 cp /cosa/component-rpms/*.rpm overrides/rpm
 cosa fetch
 cosa build
+# Cosa no longer creates  QEMU image by default see:
+# https://github.com/coreos/coreos-assembler/issues/4304
+cosa buildextend-qemu
 cosa kola run 'ext.rpm-ostree.*'
diff --git a/tests/kolainst/destructive/container-image b/tests/kolainst/destructive/container-image
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This test reboots a lot, generates container images, etc.
-# kola: { "timeoutMin": 30 }
+# kola: { "timeoutMin": 30, "minDisk": 20 }
 #
 # Copyright (C) 2021 Red Hat, Inc.
 #

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`# This test reboots a lot, generates container images, etc.`
`3`		`-# kola: { "timeoutMin": 30 }`
	`3`	`+# kola: { "timeoutMin": 30, "minDisk": 20 }`
`4`	`4`	`#`
`5`	`5`	`# Copyright (C) 2021 Red Hat, Inc.`
`6`	`6`	`#`