Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci & tests: Use registry.fedoraproject.org for Fedora container images #2988

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/buildroot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:40
FROM registry.fedoraproject.org/fedora:40
COPY . /src
RUN ./src/install-buildroot.sh && yum clean all && rm /src -rf
2 changes: 1 addition & 1 deletion tests/kola/binfmt/qemu
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -xeuo pipefail

case "$(arch)" in
aarch64|ppc64le|s390x)
containerArch=$(podman run --arch=amd64 --rm quay.io/fedora/fedora:40 arch)
containerArch=$(podman run --arch=amd64 --rm registry.fedoraproject.org/fedora:40 arch)
if [ "$containerArch" != "x86_64" ]; then
fatal "Test failed: x86_64 qemu emulator failed to run"
fi
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/containers/quadlet/config.bu
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ storage:
Description=A minimal container

[Container]
Image=quay.io/fedora/fedora-minimal:39
Image=registry.fedoraproject.org/fedora-minimal:40
Exec=sleep 60
Volume=test.volume:/data
Network=test.network
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/containers/quadlet/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if ! is_service_active test.service; then
fatal "test-network.service failed to start"
fi
container_info=$(podman container inspect systemd-test)
if [[ "$(jq -r '.[0].ImageName' <<< "$container_info")" != "quay.io/fedora/fedora-minimal:39" ]]; then
if [[ "$(jq -r '.[0].ImageName' <<< "$container_info")" != "registry.fedoraproject.org/fedora-minimal:40" ]]; then
fatal "Container not using the correct image"
fi
if [[ "$(jq -r '.[0].NetworkSettings.Networks[].NetworkID' <<< "$container_info")" != "systemd-test" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/docker/basic
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ set -xeuo pipefail
# shellcheck disable=SC1091
. "$KOLA_EXT_DATA/commonlib.sh"

docker run --rm quay.io/fedora/fedora:40 true
docker run --rm registry.fedoraproject.org/fedora:40 true

ok "basic docker run successfully"
2 changes: 1 addition & 1 deletion tests/kola/ntp/data/ntplib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:40
FROM registry.fedoraproject.org/fedora:40
RUN dnf -y install systemd dnsmasq iproute iputils \
&& dnf clean all \
&& systemctl enable dnsmasq
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/podman/dns/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runascoreuserscript='
set -euxo pipefail

podman network create testnetwork
podman run --rm -t --network=testnetwork quay.io/fedora/fedora:40 getent hosts google.com
podman run --rm -t --network=testnetwork registry.fedoraproject.org/fedora:40 getent hosts google.com
podman network rm testnetwork
'

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/podman/rootless-pasta-networking
Original file line number Diff line number Diff line change
Expand Up @@ -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:40 bash <<"EOF"
podman run -i --net=pasta:--mtu,1500 registry.fedoraproject.org/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
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/podman/rootless-systemd
Original file line number Diff line number Diff line change
Expand Up @@ -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:40
FROM registry.fedoraproject.org/fedora:40
RUN dnf -y update \
&& dnf -y install systemd httpd \
&& dnf clean all \
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/selinux/podman-tmpfs-context
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set -xeuo pipefail
# shellcheck disable=SC1091
. "$KOLA_EXT_DATA/commonlib.sh"

context=$(podman run --rm --privileged quay.io/fedora/fedora-toolbox:40 \
context=$(podman run --rm --privileged registry.fedoraproject.org/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"
Expand Down
Loading