From 5f281fcaaa29769807829a64d39de106c5b3df86 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Nov 11 2022 04:27:07 +0000 Subject: [PATCH 1/2] Add Fedora 37 as a target Also, drop Fedora 34. --- diff --git a/archive_repo_manager.py b/archive_repo_manager.py index 55eb1aa..d07e9a5 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 = ['34', '35', '36'] +TARGET_FEDORA_RELEASES = ['35', '36', '37'] # We are processing the org.fedoraproject.prod.bodhi.compose.complete topic diff --git a/run-archive-repo-update b/run-archive-repo-update index a9559bf..40b2c9d 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=( [34]='45719a39' - [35]='9867c58f' - [36]='38ab71f4' ) +declare -A SIGNINGKEYS=( [35]='9867c58f' + [36]='38ab71f4' + [37]='5323552a' ) # A function to get the list of builds in the updates repo # at a given timestamp. From afc910d8e30867087e0d99116dd379ca5775a209 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Nov 11 2022 04:29:21 +0000 Subject: [PATCH 2/2] Move to Fedora Linux 37 base --- diff --git a/Dockerfile b/Dockerfile index d40a85c..446600b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:36 +FROM registry.fedoraproject.org/fedora:37 # 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 c518aca..6978425 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:36 + ExecStartPre=-podman pull registry.fedoraproject.org/fedora:37 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]