From 280eebdceef43a363d7468bedfa45edaa546985f Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 10 Mar 2021 15:24:23 +0100
Subject: [PATCH] tasks/yumrepos: cope with archived Fedora releases

We have some hosts that run on archived/EOL Fedora releases, their
repository URLs need to reflect that.

Signed-off-by: Nils Philippsen <nils@redhat.com>
---
 files/common/fedora-modular.repo               |  6 +++---
 files/common/fedora-modular.repo-secondary     |  6 +++---
 files/common/fedora-updates-modular.repo       |  6 +++---
 .../fedora-updates-modular.repo-secondary      |  6 +++---
 .../common/fedora-updates-testing-modular.repo |  6 +++---
 ...dora-updates-testing-modular.repo-secondary |  6 +++---
 files/common/fedora-updates-testing.repo       | 12 ++++++------
 .../fedora-updates-testing.repo-secondary      | 12 ++++++------
 files/common/fedora-updates.repo               | 12 ++++++------
 files/common/fedora-updates.repo-secondary     | 12 ++++++------
 files/common/fedora.repo                       |  6 +++---
 files/common/fedora.repo-secondary             |  6 +++---
 tasks/yumrepos.yml                             | 18 ++++++++++++++++++
 13 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/files/common/fedora-modular.repo b/files/common/fedora-modular.repo
index 56ef068689..cacbc82abd 100644
--- a/files/common/fedora-modular.repo
+++ b/files/common/fedora-modular.repo
@@ -2,7 +2,7 @@
 name=Fedora Modular $releasever - $basearch
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/$basearch/os/
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/$basearch/os/
 {% endif %}
@@ -16,7 +16,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora Modular $releasever - $basearch - Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/$basearch/debug/tree/
 {% endif %}
@@ -30,7 +30,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora Modular $releasever - Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/source/tree/
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/source/tree/
 {% endif %}
diff --git a/files/common/fedora-modular.repo-secondary b/files/common/fedora-modular.repo-secondary
index 83b9c25a31..84a9dfdcf6 100644
--- a/files/common/fedora-modular.repo-secondary
+++ b/files/common/fedora-modular.repo-secondary
@@ -2,7 +2,7 @@
 name=Fedora Modular $releasever - $basearch
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/$basearch/os/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Modular/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch/os
@@ -16,7 +16,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora Modular $releasever - $basearch - Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/$basearch/debug/tree/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Modular/$basearch/debug/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch/debug/tree
@@ -30,7 +30,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora Modular $releasever - Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/source/tree/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Modular/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/source/tree
diff --git a/files/common/fedora-updates-modular.repo b/files/common/fedora-updates-modular.repo
index 6209b45c6e..e6633268f9 100644
--- a/files/common/fedora-updates-modular.repo
+++ b/files/common/fedora-updates-modular.repo
@@ -1,7 +1,7 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
 enabled=1
 gpgcheck=1
@@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - Debug
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
@@ -19,7 +19,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates Source
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/SRPMS/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
diff --git a/files/common/fedora-updates-modular.repo-secondary b/files/common/fedora-updates-modular.repo-secondary
index 4438f4bc9c..1536696f38 100644
--- a/files/common/fedora-updates-modular.repo-secondary
+++ b/files/common/fedora-updates-modular.repo-secondary
@@ -2,7 +2,7 @@
 name=Fedora Modular $releasever - $basearch - Updates
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/$basearch/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch
@@ -15,7 +15,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora Modular $releasever - $basearch - Updates - Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/$basearch/debug/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch/debug
@@ -28,7 +28,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora Modular $releasever - Updates Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/SRPMS/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/SRPMS
diff --git a/files/common/fedora-updates-testing-modular.repo b/files/common/fedora-updates-testing-modular.repo
index f5568e1dde..2047e50451 100644
--- a/files/common/fedora-updates-testing-modular.repo
+++ b/files/common/fedora-updates-testing-modular.repo
@@ -1,7 +1,7 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Modular/$basearch/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
@@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates Debug
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
@@ -19,7 +19,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/SRPMS/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
diff --git a/files/common/fedora-updates-testing-modular.repo-secondary b/files/common/fedora-updates-testing-modular.repo-secondary
index aabf4b721a..0b05a4cf73 100644
--- a/files/common/fedora-updates-testing-modular.repo-secondary
+++ b/files/common/fedora-updates-testing-modular.repo-secondary
@@ -1,7 +1,7 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Modular/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Modular/$basearch/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
@@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates Debug
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/$basearch/debug/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
@@ -19,7 +19,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
 failovermethod=priority
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/SRPMS/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
diff --git a/files/common/fedora-updates-testing.repo b/files/common/fedora-updates-testing.repo
index 8f6ebd0a8f..52f807b444 100644
--- a/files/common/fedora-updates-testing.repo
+++ b/files/common/fedora-updates-testing.repo
@@ -2,9 +2,9 @@
 name=Fedora $releasever - $basearch - Test Updates
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/$basearch/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
@@ -15,9 +15,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - $basearch - Test Updates Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/$basearch/debug/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
@@ -28,9 +28,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - Test Updates Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/SRPMS/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
diff --git a/files/common/fedora-updates-testing.repo-secondary b/files/common/fedora-updates-testing.repo-secondary
index 7173563574..734a342fc1 100644
--- a/files/common/fedora-updates-testing.repo-secondary
+++ b/files/common/fedora-updates-testing.repo-secondary
@@ -2,9 +2,9 @@
 name=Fedora $releasever - $basearch - Test Updates
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Everything/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Everything/$basearch/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/$basearch/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
@@ -15,9 +15,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - $basearch - Test Updates Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Everything/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Everything/$basearch/debug/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/$basearch/debug/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
@@ -28,9 +28,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - Test Updates Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Everything/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Everything/SRPMS/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/SRPMS/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
diff --git a/files/common/fedora-updates.repo b/files/common/fedora-updates.repo
index c92aa782f8..f01ae60fb7 100644
--- a/files/common/fedora-updates.repo
+++ b/files/common/fedora-updates.repo
@@ -2,9 +2,9 @@
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 {% if ansible_distribution_major_version|int > 27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/$basearch/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/$basearch/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=1
@@ -15,9 +15,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int > 27  %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 {% else %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/$basearch/debug/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
@@ -28,9 +28,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - Updates Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int > 27  %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/SRPMS/
 {% else %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/SRPMS/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
diff --git a/files/common/fedora-updates.repo-secondary b/files/common/fedora-updates.repo-secondary
index c846765ac7..f65f951d24 100644
--- a/files/common/fedora-updates.repo-secondary
+++ b/files/common/fedora-updates.repo-secondary
@@ -2,9 +2,9 @@
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Everything/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Everything/$basearch/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/$basearch/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=1
@@ -15,9 +15,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Everything/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Everything/$basearch/debug/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/debug/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/$basearch/debug/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
@@ -28,9 +28,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - Updates Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int >27  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/SRPMS/
 {% else %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Everything/SRPMS/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Everything/SRPMS/
 {% endif %}
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
diff --git a/files/common/fedora.repo b/files/common/fedora.repo
index 6241378235..b8dcf7662e 100644
--- a/files/common/fedora.repo
+++ b/files/common/fedora.repo
@@ -2,7 +2,7 @@
 name=Fedora $releasever - $basearch
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
@@ -16,7 +16,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/debug/tree/
@@ -30,7 +30,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched|int is defined else FedoraRawhideNumber|int )  %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/source/tree
diff --git a/files/common/fedora.repo-secondary b/files/common/fedora.repo-secondary
index c633d8c7f1..d67ea25654 100644
--- a/files/common/fedora.repo-secondary
+++ b/files/common/fedora.repo-secondary
@@ -2,7 +2,7 @@
 name=Fedora $releasever - $basearch
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
+baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Everything/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
@@ -16,7 +16,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/debug/tree/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Everything/$basearch/debug/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/debug/tree/
@@ -30,7 +30,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 name=Fedora $releasever - Source
 failovermethod=priority
 {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int )  %}
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/source/tree/
+baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Everything/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 {% else %}
 baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/source/tree/
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index 72be1303f3..7fda021062 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -8,6 +8,24 @@
   - packages
   - yumrepos
 
+- name: enable repos for archived Fedora releases
+  set_fact:
+    archive_if_archived: >-
+      {{
+        '/archive'
+        if ansible_distribution_major_version|int < (
+          FedoraPreviousPreviousCycleNumber|int
+          if FedoraPreviousPrevious == True
+          else FedoraPreviousCycleNumber|int
+        )
+        else ''
+      }}
+  when: ansible_distribution == 'Fedora'
+  tags:
+  - config
+  - packages
+  - yumrepos
+
 - name: put rhel repos on rhel systems
   copy: src="{{ files }}/common/rhel{{ ansible_distribution_major_version|int }}.repo" dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version|int }}.repo"
   when: ansible_distribution == 'RedHat' and not inventory_hostname.startswith('ppc9') and datacenter != "aws"