From 7e3c9fc374a6fec78728e7d7fb31ad192936c85b Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: May 07 2022 04:35:30 +0000
Subject: [PATCH 1/3] Move to Fedora Linux 36 base


---

diff --git a/Dockerfile b/Dockerfile
index 11bacb5..d40a85c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:36
 
 # Get any latest updates since last container spin
 RUN dnf update -y
diff --git a/archive-repo-manager.bu b/archive-repo-manager.bu
index 6b64a1c..ed53850 100644
--- a/archive-repo-manager.bu
+++ b/archive-repo-manager.bu
@@ -103,7 +103,7 @@ storage:
           Type=oneshot
           RemainAfterExit=yes
           ExecStartPre=nm-online --timeout=30
-          ExecStartPre=-podman pull registry.fedoraproject.org/fedora:35
+          ExecStartPre=-podman pull registry.fedoraproject.org/fedora:36
           ExecStart=-podman build -t localhost/archive-repo-manager:latest https://pagure.io/releng/archive-repo-manager.git
           ExecStartPost=-podman image prune --force
           [Install]

From b66dde2c834875df32e2db72fc0de37013eb9546 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: May 07 2022 04:36:00 +0000
Subject: [PATCH 2/3] butane: use --no-cache for container build


I noticed that the container has just been using the cache this
whole time. Let's tell it to start fresh so we get updated
containers.

---

diff --git a/archive-repo-manager.bu b/archive-repo-manager.bu
index ed53850..c518aca 100644
--- a/archive-repo-manager.bu
+++ b/archive-repo-manager.bu
@@ -104,7 +104,7 @@ storage:
           RemainAfterExit=yes
           ExecStartPre=nm-online --timeout=30
           ExecStartPre=-podman pull registry.fedoraproject.org/fedora:36
-          ExecStart=-podman build -t localhost/archive-repo-manager:latest https://pagure.io/releng/archive-repo-manager.git
+          ExecStart=-podman build --no-cache -t localhost/archive-repo-manager:latest https://pagure.io/releng/archive-repo-manager.git
           ExecStartPost=-podman image prune --force
           [Install]
           WantedBy=default.target

From c3ad03ed5f92b7630760f025529eb9a12edb466e Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: May 07 2022 04:37:47 +0000
Subject: [PATCH 3/3] Add Fedora 36 as a target


Also, drop Fedora 33.

---

diff --git a/archive_repo_manager.py b/archive_repo_manager.py
index 3dd9a27..55eb1aa 100755
--- a/archive_repo_manager.py
+++ b/archive_repo_manager.py
@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 ARCHIVE_REPO_MOUNT_POINT = '/mnt/bucket/'
-TARGET_FEDORA_RELEASES = ['33', '34', '35']
+TARGET_FEDORA_RELEASES = ['34', '35', '36']
 
 
 # We are processing the org.fedoraproject.prod.bodhi.compose.complete topic
diff --git a/run-archive-repo-update b/run-archive-repo-update
index bd584e1..a9559bf 100755
--- a/run-archive-repo-update
+++ b/run-archive-repo-update
@@ -5,9 +5,9 @@ set -eu -o pipefail
 LOCAL_WORKDIR='/var/archive-repo-manager'
 PREVIOUS_RUNS_DATESTAMP_FILE=previous-run-datestamps.txt
 ARCHES="aarch64 armhfp ppc64le s390x x86_64"
-declare -A SIGNINGKEYS=( [33]='9570ff31'
-                         [34]='45719a39'
-                         [35]='9867c58f' )
+declare -A SIGNINGKEYS=( [34]='45719a39'
+                         [35]='9867c58f'
+                         [36]='38ab71f4' )
 
 # A function to get the list of builds in the updates repo
 # at a given timestamp.