From ec251cff203077e42491d42bca91cfd89c9b475f Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 20 2023 02:41:10 +0000 Subject: [PATCH 1/3] Add Fedora 38 as a target Also, drop Fedora 35. --- diff --git a/archive_repo_manager.py b/archive_repo_manager.py index d07e9a5..19c960a 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 = ['35', '36', '37'] +TARGET_FEDORA_RELEASES = ['36', '37', '38'] # We are processing the org.fedoraproject.prod.bodhi.compose.complete topic diff --git a/run-archive-repo-update b/run-archive-repo-update index c5c928d..22b5b1b 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 ppc64le s390x x86_64" -declare -A SIGNINGKEYS=( [35]='9867c58f' - [36]='38ab71f4' - [37]='5323552a' ) +declare -A SIGNINGKEYS=( [36]='38ab71f4' + [37]='5323552a' + [38]='eb10b464' ) # A function to get the list of builds in the updates repo # at a given timestamp. From 3307c771edb16010f0db8c69252c3d56c77139ce Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 20 2023 02:44:10 +0000 Subject: [PATCH 2/3] Move to Fedora Linux 38 base --- diff --git a/Dockerfile b/Dockerfile index 446600b..0ac9c5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 # 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 6978425..26d5146 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:37 + ExecStartPre=-podman pull registry.fedoraproject.org/fedora:38 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] From 913c0a76ff09ecea43078794163471f9921db9a6 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 22 2023 03:32:08 +0000 Subject: [PATCH 3/3] switch to quadlet style container definition Let's now use a .container file to define the running container since it's now supported and so much easier to understand than what we had in the past. --- diff --git a/archive-repo-manager.bu b/archive-repo-manager.bu index 26d5146..158c86f 100644 --- a/archive-repo-manager.bu +++ b/archive-repo-manager.bu @@ -33,6 +33,16 @@ storage: name: worker group: name: worker + - path: /home/worker/.config/containers + user: + name: worker + group: + name: worker + - path: /home/worker/.config/containers/systemd + user: + name: worker + group: + name: worker files: - path: /etc/hostname mode: 0644 @@ -59,7 +69,7 @@ storage: AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY AWSACCESSKEYID=$AWSACCESSKEYID AWSSECRETACCESSKEY=$AWSSECRETACCESSKEY - - path: /home/worker/.config/systemd/user/container-archive-repo-manager.service + - path: /home/worker/.config/containers/systemd/archive-repo-manager.container mode: 0644 user: name: worker @@ -67,24 +77,14 @@ storage: name: worker contents: inline: | - # Generated with: podman generate systemd --new --name archive-repo-manager - # autogenerated by Podman 3.0.1 [Unit] - Description=Podman container-archive-repo-manager.service - Documentation=man:podman-generate-systemd(1) + Description=Container for archive-repo-manager After=build-archive-repo-manager.service - [Service] - Environment=PODMAN_SYSTEMD_UNIT=%n + [Container] + ContainerName=archive-repo-manager + Image=localhost/archive-repo-manager:latest EnvironmentFile=/home/worker/archive-repo-manager-environment - Restart=on-failure - TimeoutStopSec=70 - ExecStartPre=nm-online --timeout=30 - ExecStartPre=/bin/rm -f %t/container-archive-repo-manager.pid %t/container-archive-repo-manager.ctr-id - ExecStart=/usr/bin/podman run --conmon-pidfile %t/container-archive-repo-manager.pid --cidfile %t/container-archive-repo-manager.ctr-id --cgroups=no-conmon --replace -d --rm -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWSACCESSKEYID -e AWSSECRETACCESSKEY -e S3BUCKET --device /dev/fuse --name archive-repo-manager localhost/archive-repo-manager:latest - ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-archive-repo-manager.ctr-id -t 10 - ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-archive-repo-manager.ctr-id - PIDFile=%t/container-archive-repo-manager.pid - Type=forking + AddDevice=/dev/fuse [Install] WantedBy=default.target - path: /home/worker/.config/systemd/user/build-archive-repo-manager.service @@ -103,21 +103,16 @@ storage: Type=oneshot RemainAfterExit=yes ExecStartPre=nm-online --timeout=30 - ExecStartPre=-podman pull registry.fedoraproject.org/fedora:38 - ExecStart=-podman build --no-cache -t localhost/archive-repo-manager:latest https://pagure.io/releng/archive-repo-manager.git - ExecStartPost=-podman image prune --force + ExecStart=podman build --pull-always --cache-ttl=336h \ + -t localhost/archive-repo-manager:latest \ + https://pagure.io/releng/archive-repo-manager.git + ExecStartPost=-podman image prune --force --filter until=400h [Install] WantedBy=default.target links: - - path: /home/worker/.config/systemd/user/default.target.wants/container-archive-repo-manager.service - user: - name: worker - group: - name: worker - target: /home/worker/.config/systemd/user/container-archive-repo-manager.service - path: /home/worker/.config/systemd/user/default.target.wants/build-archive-repo-manager.service + target: /home/worker/.config/systemd/user/build-archive-repo-manager.service user: name: worker group: name: worker - target: /home/worker/.config/systemd/user/build-archive-repo-manager.service