From 0b9e0d07bc2d6370aec357b1e4b56300d8294b42 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 27 2021 19:57:24 +0000 Subject: [PATCH 1/2] archive_repo_manager.py: operate on Fedora 34 now Fedora 34 is the new jazz. F32 is old; drop it. --- diff --git a/Dockerfile b/Dockerfile index 9728250..c79c043 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:33 +FROM registry.fedoraproject.org/fedora:34 # Get any latest updates since last container spin RUN dnf update -y diff --git a/archive_repo_manager.py b/archive_repo_manager.py index e95e300..16cfee6 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 = ['32', '33'] +TARGET_FEDORA_RELEASES = ['33', '34'] # We are processing the org.fedoraproject.prod.bodhi.compose.complete topic From 1fd234bed18a50edf79bd402057bc381b4b0ccba Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 27 2021 19:59:18 +0000 Subject: [PATCH 2/2] README: FCCT has been renamed to Butane --- diff --git a/README.md b/README.md index 3f4e6cc..9093333 100644 --- a/README.md +++ b/README.md @@ -78,11 +78,11 @@ HISTCONTROL='ignoreboth' export AWS_ACCESS_KEY_ID= export AWS_SECRET_ACCESS_KEY= export SSH_KEY=$(cat id_rsa.pub) -cat fcct.yaml | envsubst | fcct --pretty > config.ign.json +cat archive-repo-manager.bu | envsubst | butane --pretty > archive-repo-manager.ign ``` -Then launch the FCOS machine with the `config.ign.json`. After logging -in you can switch to the `worker` user and monitor the systemd user +Then launch the FCOS machine with the `archive-repo-manager.ign`. After +logging in you can switch to the `worker` user and monitor the systemd user units: ``` diff --git a/archive-repo-manager.bu b/archive-repo-manager.bu new file mode 100644 index 0000000..dc4c2e6 --- /dev/null +++ b/archive-repo-manager.bu @@ -0,0 +1,110 @@ +variant: fcos +version: 1.3.0 +passwd: + users: + - name: core + ssh_authorized_keys: + - $SSH_KEY + - name: worker +storage: + directories: + - path: /home/worker/.config + user: + name: worker + group: + name: worker + - path: /home/worker/.config/systemd + user: + name: worker + group: + name: worker + - path: /home/worker/.config/systemd/user + user: + name: worker + group: + name: worker + - path: /home/worker/.config/systemd/user/default.target.wants + user: + name: worker + group: + name: worker + files: + - path: /var/lib/systemd/linger/worker + mode: 0644 + - path: /home/worker/archive-repo-manager-environment + mode: 0600 + user: + name: worker + group: + name: worker + contents: + inline: | + S3BUCKET=$S3BUCKET + AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY + AWSACCESSKEYID=$AWSACCESSKEYID + AWSSECRETACCESSKEY=$AWSSECRETACCESSKEY + - path: /home/worker/.config/systemd/user/container-archive-repo-manager.service + mode: 0644 + user: + name: worker + group: + 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) + Wants=network.target + After=network-online.target + After=build-archive-repo-manager.service + [Service] + Environment=PODMAN_SYSTEMD_UNIT=%n + EnvironmentFile=/home/worker/archive-repo-manager-environment + Restart=on-failure + TimeoutStopSec=70 + 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 + [Install] + WantedBy=default.target + - path: /home/worker/.config/systemd/user/build-archive-repo-manager.service + mode: 0644 + user: + name: worker + group: + name: worker + contents: + inline: | + [Unit] + Description=Build archive-repo-manager container + After=network-online.target + Wants=network-online.target + [Service] + # Give time for the build to complete + TimeoutStartSec=10m + Type=oneshot + RemainAfterExit=yes + ExecStartPre=-podman pull registry.fedoraproject.org/fedora:33 + ExecStart=-podman build -t localhost/archive-repo-manager:latest https://pagure.io/releng/archive-repo-manager.git + ExecStartPost=-podman image prune --force + [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 + user: + name: worker + group: + name: worker + target: /home/worker/.config/systemd/user/build-archive-repo-manager.service diff --git a/fcct.yaml b/fcct.yaml deleted file mode 100644 index dc4c2e6..0000000 --- a/fcct.yaml +++ /dev/null @@ -1,110 +0,0 @@ -variant: fcos -version: 1.3.0 -passwd: - users: - - name: core - ssh_authorized_keys: - - $SSH_KEY - - name: worker -storage: - directories: - - path: /home/worker/.config - user: - name: worker - group: - name: worker - - path: /home/worker/.config/systemd - user: - name: worker - group: - name: worker - - path: /home/worker/.config/systemd/user - user: - name: worker - group: - name: worker - - path: /home/worker/.config/systemd/user/default.target.wants - user: - name: worker - group: - name: worker - files: - - path: /var/lib/systemd/linger/worker - mode: 0644 - - path: /home/worker/archive-repo-manager-environment - mode: 0600 - user: - name: worker - group: - name: worker - contents: - inline: | - S3BUCKET=$S3BUCKET - AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY - AWSACCESSKEYID=$AWSACCESSKEYID - AWSSECRETACCESSKEY=$AWSSECRETACCESSKEY - - path: /home/worker/.config/systemd/user/container-archive-repo-manager.service - mode: 0644 - user: - name: worker - group: - 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) - Wants=network.target - After=network-online.target - After=build-archive-repo-manager.service - [Service] - Environment=PODMAN_SYSTEMD_UNIT=%n - EnvironmentFile=/home/worker/archive-repo-manager-environment - Restart=on-failure - TimeoutStopSec=70 - 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 - [Install] - WantedBy=default.target - - path: /home/worker/.config/systemd/user/build-archive-repo-manager.service - mode: 0644 - user: - name: worker - group: - name: worker - contents: - inline: | - [Unit] - Description=Build archive-repo-manager container - After=network-online.target - Wants=network-online.target - [Service] - # Give time for the build to complete - TimeoutStartSec=10m - Type=oneshot - RemainAfterExit=yes - ExecStartPre=-podman pull registry.fedoraproject.org/fedora:33 - ExecStart=-podman build -t localhost/archive-repo-manager:latest https://pagure.io/releng/archive-repo-manager.git - ExecStartPost=-podman image prune --force - [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 - user: - name: worker - group: - name: worker - target: /home/worker/.config/systemd/user/build-archive-repo-manager.service