From 8c8e2b48c645f78c39387d1fc9a751fb855b1c22 Mon Sep 17 00:00:00 2001
From: CoreOS Bot <coreosbot@fedoraproject.org>
Date: Wed, 24 Apr 2024 05:00:27 +0000
Subject: [PATCH] tree: import changes from testing-devel at
 5c9ec57af9191a48b6bc802bbf1993b4206cf73f

---
 ci/buildroot/Dockerfile                     | 2 +-
 tests/kola/binfmt/qemu                      | 2 +-
 tests/kola/docker/basic                     | 2 +-
 tests/kola/ntp/data/ntplib.sh               | 2 +-
 tests/kola/podman/dns/test.sh               | 2 +-
 tests/kola/podman/rootless-pasta-networking | 2 +-
 tests/kola/podman/rootless-systemd          | 2 +-
 tests/kola/selinux/podman-tmpfs-context     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/buildroot/Dockerfile b/ci/buildroot/Dockerfile
index e80283bf8d..1df17e8824 100644
--- a/ci/buildroot/Dockerfile
+++ b/ci/buildroot/Dockerfile
@@ -5,6 +5,6 @@
 #
 # This image is used by CoreOS CI to build software like
 # Ignition, rpm-ostree, ostree, coreos-installer, etc...
-FROM quay.io/fedora/fedora:39
+FROM quay.io/fedora/fedora:40
 COPY . /src
 RUN ./src/install-buildroot.sh && yum clean all && rm /src -rf
diff --git a/tests/kola/binfmt/qemu b/tests/kola/binfmt/qemu
index 70282cf188..27e8d5e9f5 100755
--- a/tests/kola/binfmt/qemu
+++ b/tests/kola/binfmt/qemu
@@ -20,7 +20,7 @@ set -xeuo pipefail
 
 case "$(arch)" in
     aarch64|ppc64le|s390x)
-        containerArch=$(podman run --arch=amd64 --rm quay.io/fedora/fedora:39 arch)
+        containerArch=$(podman run --arch=amd64 --rm quay.io/fedora/fedora:40 arch)
         if [ "$containerArch" != "x86_64" ]; then
             fatal "Test failed: x86_64 qemu emulator failed to run"
         fi
diff --git a/tests/kola/docker/basic b/tests/kola/docker/basic
index e8c970e5ef..8a140bb67c 100755
--- a/tests/kola/docker/basic
+++ b/tests/kola/docker/basic
@@ -13,6 +13,6 @@ set -xeuo pipefail
 # shellcheck disable=SC1091
 . "$KOLA_EXT_DATA/commonlib.sh"
 
-docker run --rm quay.io/fedora/fedora:39 true
+docker run --rm quay.io/fedora/fedora:40 true
 
 ok "basic docker run successfully"
diff --git a/tests/kola/ntp/data/ntplib.sh b/tests/kola/ntp/data/ntplib.sh
index 507e8cea1a..a17c1229ed 100644
--- a/tests/kola/ntp/data/ntplib.sh
+++ b/tests/kola/ntp/data/ntplib.sh
@@ -20,7 +20,7 @@ ntp_test_setup() {
     # run podman commands to set up dnsmasq server
     pushd "$(mktemp -d)"
     cat <<EOF >Dockerfile
-FROM quay.io/fedora/fedora:39
+FROM quay.io/fedora/fedora:40
 RUN dnf -y install systemd dnsmasq iproute iputils \
 && dnf clean all \
 && systemctl enable dnsmasq
diff --git a/tests/kola/podman/dns/test.sh b/tests/kola/podman/dns/test.sh
index b3c77efb8f..e77836d192 100755
--- a/tests/kola/podman/dns/test.sh
+++ b/tests/kola/podman/dns/test.sh
@@ -23,7 +23,7 @@ runascoreuserscript='
 set -euxo pipefail
 
 podman network create testnetwork
-podman run --rm -t --network=testnetwork quay.io/fedora/fedora:39 getent hosts google.com
+podman run --rm -t --network=testnetwork quay.io/fedora/fedora:40 getent hosts google.com
 podman network rm testnetwork
 '
 
diff --git a/tests/kola/podman/rootless-pasta-networking b/tests/kola/podman/rootless-pasta-networking
index ca11c4126e..594743a6ee 100755
--- a/tests/kola/podman/rootless-pasta-networking
+++ b/tests/kola/podman/rootless-pasta-networking
@@ -20,7 +20,7 @@ set -xeuo pipefail
 runascoreuserscript='#!/bin/bash
 set -euxo pipefail
 # Just a basic test that uses pasta network and sets the gateway
-podman run -i --net=pasta:--mtu,1500 quay.io/fedora/fedora:39 bash <<"EOF"
+podman run -i --net=pasta:--mtu,1500 quay.io/fedora/fedora:40 bash <<"EOF"
 set -euxo pipefail
 # Verify the mtu got set to 1500. No /sbin/ip so just use /sys/class/net/<nic>/mtu
 cat /sys/class/net/e*/mtu | grep 1500
diff --git a/tests/kola/podman/rootless-systemd b/tests/kola/podman/rootless-systemd
index bae9596532..cdfd51b0ff 100755
--- a/tests/kola/podman/rootless-systemd
+++ b/tests/kola/podman/rootless-systemd
@@ -35,7 +35,7 @@ set -euxo pipefail
 #       https://github.com/coreos/coreos-assembler/issues/1645
 cd $(mktemp -d)
 cat <<EOF > Containerfile
-FROM quay.io/fedora/fedora:39
+FROM quay.io/fedora/fedora:40
 RUN dnf -y update \
 && dnf -y install systemd httpd \
 && dnf clean all \
diff --git a/tests/kola/selinux/podman-tmpfs-context b/tests/kola/selinux/podman-tmpfs-context
index 1e033e9f2d..52ce4d44da 100755
--- a/tests/kola/selinux/podman-tmpfs-context
+++ b/tests/kola/selinux/podman-tmpfs-context
@@ -15,7 +15,7 @@ set -xeuo pipefail
 # shellcheck disable=SC1091
 . "$KOLA_EXT_DATA/commonlib.sh"
 
-context=$(podman run --rm --privileged quay.io/fedora/fedora:39 \
+context=$(podman run --rm --privileged quay.io/fedora/fedora-toolbox:40 \
             bash -c "mount -t tmpfs tmpfs /mnt/ && stat --format '%C' /mnt/")
 if [ "$context" != "system_u:object_r:container_file_t:s0" ]; then
     fatal "SELinux context for files on a tmpfs inside a container is wrong"