Skip to content

Commit

Permalink
tests/kola: use fedora-archive.repo when setting up fedora container
Browse files Browse the repository at this point in the history
The `fedora-archive.repo` file now contains both EOL and non-EOL repo
locations[1]. This means we can change the two kola tests that use the
fedora container to use `fedora-archive.repo` as the only repo
configuration file. This reduces the maintenance burden because now we
don't have to change this curl statement when fedora versions reach EOL.

[1] #3145
  • Loading branch information
marmijo committed Sep 5, 2024
1 parent 2d1f43d commit a52b98b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/kola/ntp/data/ntplib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ntp_test_setup() {
cat <<EOF >Dockerfile
FROM quay.io/fedora/fedora:40
RUN rm -f /etc/yum.repos.d/*.repo \
&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora.repo -o /etc/yum.repos.d/fedora.repo
&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-archive.repo -o /etc/yum.repos.d/fedora-archive.repo
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/rootless-systemd
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cd $(mktemp -d)
cat <<EOF > Containerfile
FROM quay.io/fedora/fedora:40
RUN rm -f /etc/yum.repos.d/*.repo \
&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora.repo -o /etc/yum.repos.d/fedora.repo
&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-archive.repo -o /etc/yum.repos.d/fedora-archive.repo
RUN dnf -y update \
&& dnf -y install systemd httpd \
&& dnf clean all \
Expand Down

0 comments on commit a52b98b

Please sign in to comment.