From 58cb5fa4b052a19c2a8b8ce2d7bdbae8e6a6e564 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Oct 28 2024 19:26:42 +0000 Subject: [PATCH 1/3] Add Fedora 41 as a target --- diff --git a/archive_repo_manager.py b/archive_repo_manager.py index eb15eb0..d62e87c 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 = ['39', '40'] +TARGET_FEDORA_RELEASES = ['39', '40', '41'] # We are processing the org.fedoraproject.prod.bodhi.compose.complete topic diff --git a/run-archive-repo-update b/run-archive-repo-update index 858cf7c..f464d9d 100755 --- a/run-archive-repo-update +++ b/run-archive-repo-update @@ -6,7 +6,8 @@ LOCAL_WORKDIR='/var/archive-repo-manager' PREVIOUS_RUNS_DATESTAMP_FILE=previous-run-datestamps.txt ARCHES="aarch64 ppc64le s390x x86_64" declare -A SIGNINGKEYS=( [39]='18b8e74c' - [40]='a15b79cc' ) + [40]='a15b79cc' + [41]='e99d6ad1' ) # A function to get the list of builds in the updates repo # at a given timestamp. From 287421b81bf1a9b0b26cb2e01f9a8992c2735fa6 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Oct 28 2024 19:27:16 +0000 Subject: [PATCH 2/3] Move to Fedora Linux 41 base --- diff --git a/Dockerfile b/Dockerfile index 656c5f3..96bf544 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora:40 +FROM quay.io/fedora/fedora:41 # Get any latest updates since last container spin RUN dnf update -y From e2dc93248add6bb2b83d11952ea5f98d2050960c Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Oct 28 2024 19:27:31 +0000 Subject: [PATCH 3/3] provisioning: move to instance with 8GiB of memory We kept hitting OOM before so let's bump it a bit. --- diff --git a/provisioning/main.tf b/provisioning/main.tf index 9075560..3eab73d 100644 --- a/provisioning/main.tf +++ b/provisioning/main.tf @@ -60,7 +60,7 @@ resource "aws_instance" "archive-repo-manager" { Name = "archive-repo-manager-${formatdate("YYYYMMDD", timestamp())}" } ami = local.ami - instance_type = "a1.large" + instance_type = "r6g.medium" user_data = data.ct_config.butane.rendered associate_public_ip_address = "true" vpc_security_group_ids = [aws_security_group.sg.id]