feat: change vault to use artifactapi (#168)

Co-authored-by: Ben Vincent <ben@unkin.net>
Reviewed-on: #168

.pre-commit-config.yaml

@@ -31,6 +31,24 @@ repos:
             "-s",
           ]
 
+  - repo: local
+    hooks:
+      - id: pytest
+        name: Run unit tests
+        entry: make test
+        language: system
+        types: [python]
+        pass_filenames: false
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.37.2
+    hooks:
+      - id: check-jsonschema
+        name: Validate RPM package metadata
+        files: ^rpms/[^/]+/metadata\.yaml$
+        args: [--schemafile, schema/metadata.json]
+        language_version: python3.11
+
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.7
     hooks:

.woodpecker/build-almalinux8.yaml

@@ -7,7 +7,6 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
-      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el8 --buildah
     privileged: true
     backend_options:

.woodpecker/build-almalinux9.yaml

@@ -7,7 +7,6 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
-      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el9 --buildah
     privileged: true
     backend_options:

.woodpecker/build-fedora42.yaml

@@ -0,0 +1,26 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: build rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - ./tools/build build-all --distro fedora/42 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
+
+  - name: show rpms
+    image: git.unkin.net/unkin/fedora42-base:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/build-fedora43.yaml

@@ -0,0 +1,26 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: build rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - ./tools/build build-all --distro fedora/43 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
+
+  - name: show rpms
+    image: git.unkin.net/unkin/fedora43-base:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/build-fedora44.yaml

@@ -0,0 +1,26 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: build rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - ./tools/build build-all --distro fedora/44 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
+
+  - name: show rpms
+    image: git.unkin.net/unkin/fedora44-base:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/deploy-almalinux8.yaml

@@ -8,7 +8,6 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
-      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el8 --buildah
     privileged: true
     backend_options:

.woodpecker/deploy-almalinux9.yaml

@@ -8,7 +8,6 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
-      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el9 --buildah
     privileged: true
     backend_options:

.woodpecker/deploy-fedora42.yaml

@@ -0,0 +1,50 @@
+when:
+  - event: push
+    branch: master
+
+steps:
+  - name: build-rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - ./tools/build build-all --distro fedora/42 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
+
+  - name: show-rpms
+    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    depends_on: [build-rpms]
+
+  - name: deploy-rpms
+    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
+    commands:
+      - |
+        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
+          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/fedora/42/upload
+        done
+    environment:
+      DRONECI_PASSWORD:
+        from_secret: DRONECI_PASSWORD
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 128Mi
+            cpu: 100m
+          limits:
+            memory: 512Mi
+            cpu: 500m
+    depends_on: [build-rpms, show-rpms]

.woodpecker/deploy-fedora43.yaml

@@ -0,0 +1,50 @@
+when:
+  - event: push
+    branch: master
+
+steps:
+  - name: build-rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - ./tools/build build-all --distro fedora/43 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
+
+  - name: show-rpms
+    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    depends_on: [build-rpms]
+
+  - name: deploy-rpms
+    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
+    commands:
+      - |
+        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
+          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/fedora/43/upload
+        done
+    environment:
+      DRONECI_PASSWORD:
+        from_secret: DRONECI_PASSWORD
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 128Mi
+            cpu: 100m
+          limits:
+            memory: 512Mi
+            cpu: 500m
+    depends_on: [build-rpms, show-rpms]

.woodpecker/deploy-fedora44.yaml

@@ -0,0 +1,50 @@
+when:
+  - event: push
+    branch: master
+
+steps:
+  - name: build-rpms
+    image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    commands:
+      - mkdir -p /woodpecker/rpms
+      - ln -s /woodpecker/rpms /workspace
+      - ./tools/build build-all --distro fedora/44 --buildah
+    privileged: true
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2
+
+  - name: show-rpms
+    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
+    commands:
+      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
+    depends_on: [build-rpms]
+
+  - name: deploy-rpms
+    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
+    commands:
+      - |
+        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
+          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/fedora/44/upload
+        done
+    environment:
+      DRONECI_PASSWORD:
+        from_secret: DRONECI_PASSWORD
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 128Mi
+            cpu: 100m
+          limits:
+            memory: 512Mi
+            cpu: 500m
+    depends_on: [build-rpms, show-rpms]

Makefile

@@ -11,7 +11,7 @@ DISTRO ?= almalinux/el9
 PACKAGES := $(shell find $(ROOT_DIR)/rpms -mindepth 1 -maxdepth 1 -type d -exec test -f {}/metadata.yaml \; -print | xargs -n1 basename | sort)
 
 # Default target to build all packages
-.PHONY: all list build clean
+.PHONY: all list build clean test
 all: build-all
 
 # List all available packages
@@ -47,6 +47,10 @@ dry-run:
 	@echo "Dry run - showing what would be built for distro $(DISTRO):"
 	$(BUILD_TOOL) build-all --distro $(DISTRO) --dry-run
 
+# Run unit tests
+test:
+	@uv run --group dev pytest tests/ -q; rc=$$?; [ $$rc -eq 5 ] && exit 0 || exit $$rc
+
 # Clean target
 clean:
 	@echo "Cleaning build artifacts..."

pyproject.toml

@@ -0,0 +1,11 @@
+[project]
+name = "rpmbuilder"
+version = "0.1.0"
+requires-python = ">=3.11"
+
+[dependency-groups]
+dev = [
+    "pytest>=8",
+    "jsonschema>=4",
+    "pyyaml>=6",
+]

rpms/act_runner/metadata.yaml

@@ -1,18 +1,20 @@
----
+name: act_runner
+github: unknown/act_runner
+description: A runner for Gitea based on act.
 arch: amd64
+platform: linux
+maintainer: Gitea
+homepage: https://gitea.com/gitea/act_runner
+license: MIT
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 0.2.12
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 0.2.12
-description: A runner for Gitea based on act.
-github: unknown/act_runner
-homepage: https://gitea.com/gitea/act_runner
-license: MIT
-maintainer: Gitea
-name: act_runner
-platform: linux

rpms/bind_exporter/metadata.yaml

@@ -1,18 +1,20 @@
----
+name: bind_exporter
+github: prometheus-community/bind_exporter
+description: Prometheus exporter for BIND
 arch: amd64
+platform: linux
+maintainer: Prometheus
+homepage: https://github.com/prometheus-community/bind_exporter
+license: Apache-2.0 license
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 0.8.0
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 0.8.0
-description: Prometheus exporter for BIND
-github: prometheus-community/bind_exporter
-homepage: https://github.com/prometheus-community/bind_exporter
-license: Apache-2.0 license
-maintainer: Prometheus
-name: bind_exporter
-platform: linux

rpms/boilerplate/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: Gruntwork
 homepage: https://github.com/gruntwork-io/boilerplate
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/claude-code/metadata.yaml

@@ -1,19 +1,19 @@
+name: claude-code
+description: Claude Code - Anthropic's agentic AI coding tool
 arch: amd64
+platform: linux
+maintainer: Anthropic
+homepage: https://claude.ai/code
+license: Proprietary
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
   repository:
   - almalinux/el8
-  version: 2.1.126
+  version: 2.1.156
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
   repository:
   - almalinux/el9
-  version: 2.1.126
+  version: 2.1.156
-claude_ai: true
-description: Claude Code - Anthropic's agentic AI coding tool
-homepage: https://claude.ai/code
-license: Proprietary
-maintainer: Anthropic
-name: claude-code
-platform: linux

rpms/cni-plugins/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: ContainerNetworking
 homepage: https://github.com/containernetworking/plugins
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/code-server/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: code-server
 github: coder/code-server
 description: VS Code in the browser.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: Coder
 homepage: https://github.com/coder/code-server
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/consul-cni/metadata.yaml

@@ -1,18 +1,21 @@
----
+name: consul-cni
+github: unknown/consul-cni
+description: Plugin for Consul on Kubernetes to allow configuring traffic redirection
+  rules without escalated container privileges.
 arch: amd64
+platform: linux
+maintainer: Hashicorp
+homepage: https://hashicorp.com
+license: Mozilla Public License, version 2.0
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 1.7.1
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 1.7.1
-description: Plugin for Consul on Kubernetes to allow configuring traffic redirection rules without escalated container privileges.
-github: unknown/consul-cni
-homepage: https://hashicorp.com
-license: Mozilla Public License, version 2.0
-maintainer: Hashicorp
-name: consul-cni
-platform: linux

rpms/consul/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: HashiCorp
 homepage: https://github.com/hashicorp/consul
 license: BUSL-1.1
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8
@@ -18,3 +19,10 @@ builds:
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
   version: 1.22.7
+- repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 1.22.7

rpms/etcd/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: https://etcd.io/
 homepage: https://etcd.io/
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/exportarr/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: onedr0p
 homepage: https://github.com/onedr0p/exportarr
 license: MIT license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/frr_exporter/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Prometheus
 homepage: https://github.com/tynany/frr_exporter
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/g10k/metadata.yaml

@@ -1,18 +1,20 @@
----
+name: g10k
+github: xorpaul/g10k
+description: An r10k fork written in Go, designed to work somwhat similar like puppetlabs/r10k.
 arch: amd64
+platform: linux
+maintainer: xorpaul
+homepage: https://github.com/xorpaul/g10k
+license: Apache2.0
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 0.9.10
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 0.9.10
-description: An r10k fork written in Go, designed to work somwhat similar like puppetlabs/r10k.
-github: xorpaul/g10k
-homepage: https://github.com/xorpaul/g10k
-license: Apache2.0
-maintainer: xorpaul
-name: g10k
-platform: linux

rpms/git-delta/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: git-delta
 github: dandavison/delta
 description: A syntax-highlighting pager for git, diff, grep, and blame output.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: dandavison
 homepage: https://github.com/dandavison/delta
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/hadolint/metadata.yaml

@@ -1,12 +1,13 @@
----
 name: hadolint
 github: hadolint/hadolint
-description: A smarter Dockerfile linter that helps you build best practice Docker images.
+description: A smarter Dockerfile linter that helps you build best practice Docker
+  images.
 arch: amd64
 platform: linux
 maintainer: hadolint
 homepage: https://github.com/hadolint/hadolint
 license: GPL-3.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/helm/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Helm Contributors
 homepage: https://github.com/helm/helm
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/helmfile/metadata.yaml

@@ -8,6 +8,7 @@ platform: linux
 maintainer: Helmfile Contributors
 homepage: https://github.com/helmfile/helmfile
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/incus/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: unkin
 homepage: https://linuxcontainers.org/incus/
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el9

rpms/jellyfin-ffmpeg-bin/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: unkin
 homepage: https://github.com/jellyfin/jellyfin-ffmpeg
 license: GPL-3.0
+dist_tag: false
 builds:
 - repository:
   - almalinux/el8

rpms/jellyfin-server/metadata.yaml

@@ -1,13 +1,15 @@
----
+name: jellyfin-server
+github: unknown/jellyfin-server
+description: jellyfin-server package
+dist_tag: false
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 10.10.7
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 10.10.7
-description: jellyfin-server package
-github: unknown/jellyfin-server
-name: jellyfin-server

rpms/jellyfin-web/metadata.yaml

@@ -1,13 +1,15 @@
----
+name: jellyfin-web
+github: unknown/jellyfin-web
+description: jellyfin-web package
+dist_tag: false
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 10.10.7
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 10.10.7
-description: jellyfin-web package
-github: unknown/jellyfin-web
-name: jellyfin-web

rpms/jsonnet-language-server/metadata.yaml

@@ -1,4 +1,13 @@
+name: jsonnet-language-server
+github: grafana/jsonnet-language-server
+description: Jsonnet Language Server Protocol implementation for the Jsonnet templating
+  language.
 arch: amd64
+platform: linux
+maintainer: Grafana Labs
+homepage: https://github.com/grafana/jsonnet-language-server
+license: Apache-2.0
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
@@ -10,11 +19,3 @@ builds:
   repository:
   - almalinux/el9
   version: 0.17.0
-description: Jsonnet Language Server Protocol implementation for the Jsonnet templating
-  language.
-github: grafana/jsonnet-language-server
-homepage: https://github.com/grafana/jsonnet-language-server
-license: Apache-2.0
-maintainer: Grafana Labs
-name: jsonnet-language-server
-platform: linux

rpms/jsonnet-lint/metadata.yaml

@@ -1,4 +1,12 @@
+name: jsonnet-lint
+github: google/go-jsonnet
+description: Linter for Jsonnet
 arch: amd64
+platform: linux
+maintainer: Google
+homepage: https://github.com/google/go-jsonnet
+license: Apache-2.0
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
@@ -10,10 +18,3 @@ builds:
   repository:
   - almalinux/el9
   version: 0.22.0
-description: Linter for Jsonnet
-github: google/go-jsonnet
-homepage: https://github.com/google/go-jsonnet
-license: Apache-2.0
-maintainer: Google
-name: jsonnet-lint
-platform: linux

rpms/jsonnet/metadata.yaml

@@ -1,4 +1,12 @@
+name: jsonnet
+github: google/go-jsonnet
+description: A data templating language
 arch: amd64
+platform: linux
+maintainer: Google
+homepage: https://github.com/google/go-jsonnet
+license: Apache-2.0
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
@@ -10,10 +18,3 @@ builds:
   repository:
   - almalinux/el9
   version: 0.22.0
-description: A data templating language
-github: google/go-jsonnet
-homepage: https://github.com/google/go-jsonnet
-license: Apache-2.0
-maintainer: Google
-name: jsonnet
-platform: linux

rpms/kubecolor/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: kubecolor
 github: kubecolor/kubecolor
 description: Colorize your kubectl output
@@ -7,6 +6,7 @@ platform: linux
 maintainer: kubecolor
 homepage: https://github.com/kubecolor/kubecolor
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/kubeconform/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Yann Hamon
 homepage: https://github.com/yannh/kubeconform
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/kubectx/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: kubectx
 github: ahmetb/kubectx
 description: Faster way to switch between clusters and namespaces in kubectl.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: ahmetb
 homepage: https://github.com/ahmetb/kubectx
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/kustomize/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: kustomize
 github: kubernetes-sigs/kustomize
 description: Kubernetes native configuration management
@@ -7,13 +6,16 @@ platform: linux
 maintainer: kubernetes-sigs
 homepage: https://github.com/kubernetes-sigs/kustomize
 license: Apache-2.0
+dist_tag: true
 github_release_pattern: ^kustomize/v.*
 builds:
-  - repository: [almalinux/el8]
+- repository:
+  - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
   version: 5.8.1
-  - repository: [almalinux/el9]
+- repository:
+  - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
   version: 5.8.1

rpms/lazydocker/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: lazydocker
 github: jesseduffield/lazydocker
 description: The lazier way to manage everything docker.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: jesseduffield
 homepage: https://github.com/jesseduffield/lazydocker
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/libfoundationdb/metadata.yaml

@@ -1,18 +1,20 @@
----
+name: libfoundationdb
+github: apple/foundationdb
+description: FoundationDB client library - Shared library for FoundationDB applications
 arch: amd64
+platform: linux
+maintainer: FoundationDB Community
+homepage: https://github.com/apple/foundationdb
+license: Apache-2.0
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 7.3.71
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 7.3.71
-description: FoundationDB client library - Shared library for FoundationDB applications
-github: apple/foundationdb
-homepage: https://github.com/apple/foundationdb
-license: Apache-2.0
-maintainer: FoundationDB Community
-name: libfoundationdb
-platform: linux

rpms/neovim-glibc-2.17/metadata.yaml

@@ -1,12 +1,13 @@
----
 name: neovim-glibc-2.17
 github: neovim/neovim-releases
-description: Vim-fork focused on extensibility and usability (glibc 2.17 compatible build).
+description: Vim-fork focused on extensibility and usability (glibc 2.17 compatible
+  build).
 arch: amd64
 platform: linux
 maintainer: neovim
 homepage: https://neovim.io
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/neovim/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: neovim
 github: neovim/neovim
 description: Vim-fork focused on extensibility and usability.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: neovim
 homepage: https://neovim.io
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/nfpm/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: GoReleaser
 homepage: https://nfpm.goreleaser.com/
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8
@@ -18,3 +19,10 @@ builds:
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
   version: 2.46.3
+- repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 2.46.3

rpms/node_exporter/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Prometheus
 homepage: https://github.com/prometheus/node_exporter
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/nomad-autoscaler/metadata.yaml

@@ -8,6 +8,7 @@ platform: linux
 maintainer: Hashicorp
 homepage: https://github.com/hashicorp/nomad-autoscaler
 license: Mozilla Public License, version 2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/nomad/metadata.yaml

@@ -1,18 +1,21 @@
----
+name: nomad
+github: unknown/nomad
+description: A simple and flexible scheduler and orchestrator to deploy and manage
+  containers and non-containerized applications across on-premises and clouds at scale.
 arch: amd64
+platform: linux
+maintainer: HashiCorp
+homepage: https://www.nomadproject.io/
+license: BUSL-1.1
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 1.10.1
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 1.10.1
-description: A simple and flexible scheduler and orchestrator to deploy and manage containers and non-containerized applications across on-premises and clouds at scale.
-github: unknown/nomad
-homepage: https://www.nomadproject.io/
-license: BUSL-1.1
-maintainer: HashiCorp
-name: nomad
-platform: linux

rpms/nzbget/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: nzbgetcom
 homepage: https://github.com/nzbgetcom/nzbget
 license: GPL-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/nzbget_exporter/metadata.yaml

@@ -1,18 +1,20 @@
----
+name: nzbget_exporter
+github: frebib/nzbget-exporter
+description: Prometheus exporter for NZBGet
 arch: amd64
+platform: linux
+maintainer: Prometheus
+homepage: https://github.com/frebib/nzbget-exporter
+license: MIT
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 2025.08.03
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 2025.08.03
-description: Prometheus exporter for NZBGet
-github: frebib/nzbget-exporter
-homepage: https://github.com/frebib/nzbget-exporter
-license: MIT
-maintainer: Prometheus
-name: nzbget_exporter
-platform: linux

rpms/openbao-plugin-secret-consul/metadata.yaml

@@ -1,12 +1,13 @@
 name: openbao-plugin-secret-consul
 github: openbao/openbao-plugins
-github_release_pattern: "^secrets-consul-v.*"
 description: OpenBao secrets engine plugin for HashiCorp Consul
 arch: amd64
 platform: linux
 maintainer: OpenBao Community
 homepage: https://github.com/openbao/openbao-plugins
 license: MPL-2.0
+dist_tag: true
+github_release_pattern: ^secrets-consul-v.*
 builds:
 - repository:
   - almalinux/el8

rpms/openbao-plugin-secret-nomad/metadata.yaml

@@ -1,12 +1,13 @@
 name: openbao-plugin-secret-nomad
 github: openbao/openbao-plugins
-github_release_pattern: "^secrets-nomad-v.*"
 description: OpenBao secrets engine plugin for HashiCorp Nomad
 arch: amd64
 platform: linux
 maintainer: OpenBao Community
 homepage: https://github.com/openbao/openbao-plugins
 license: MPL-2.0
+dist_tag: true
+github_release_pattern: ^secrets-nomad-v.*
 builds:
 - repository:
   - almalinux/el8

rpms/openbao-plugins/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: OpenBao Community
 homepage: https://github.com/openbao/openbao-plugins
 license: MPL-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/packer/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: HashiCorp
 homepage: https://www.packer.io/
 license: BUSL-1.1
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/pgbouncer_exporter/metadata.yaml

@@ -1,4 +1,12 @@
+name: pgbouncer_exporter
+github: prometheus-community/pgbouncer_exporter
+description: Prometheus exporter for PgBouncer
 arch: amd64
+platform: linux
+maintainer: Prometheus
+homepage: https://github.com/prometheus-community/pgbouncer_exporter
+license: Apache-2.0 license
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
@@ -10,10 +18,3 @@ builds:
   repository:
   - almalinux/el9
   version: 0.12.0
-description: Prometheus exporter for PgBouncer
-github: prometheus-community/pgbouncer_exporter
-homepage: https://github.com/prometheus-community/pgbouncer_exporter
-license: Apache-2.0 license
-maintainer: Prometheus
-name: pgbouncer_exporter
-platform: linux

rpms/postgres_exporter/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Prometheus
 homepage: https://github.com/prometheus-community/postgres_exporter
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/puppet-initial/metadata.yaml

@@ -1,17 +1,19 @@
----
+name: puppet-initial
+github: unknown/puppet-initial
+description: A script and service to initialise puppet for the unkin environmnet.
 arch: amd64
+platform: linux
+maintainer: UNKIN
+license: MIT
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 1.0.3
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 1.0.3
-description: A script and service to initialise puppet for the unkin environmnet.
-github: unknown/puppet-initial
-license: MIT
-maintainer: UNKIN
-name: puppet-initial
-platform: linux

rpms/puppetdb_exporter/metadata.yaml

@@ -1,18 +1,20 @@
----
+name: puppetdb_exporter
+github: camptocamp/prometheus-puppetdb-exporter
+description: Prometheus exporter for PuppetDB
 arch: amd64
+platform: linux
+maintainer: Comptocamp
+homepage: https://github.com/camptocamp/prometheus-puppetdb-exporter
+license: Apache 2.0 License
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 1.1.0
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 1.1.0
-description: Prometheus exporter for PuppetDB
-github: camptocamp/prometheus-puppetdb-exporter
-homepage: https://github.com/camptocamp/prometheus-puppetdb-exporter
-license: Apache 2.0 License
-maintainer: Comptocamp
-name: puppetdb_exporter
-platform: linux

rpms/ruff/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Astral.sh
 homepage: https://docs.astral.sh/ruff/
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/sops/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: sops
 github: getsops/sops
 description: Simple and flexible tool for managing secrets.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: getsops
 homepage: https://github.com/getsops/sops
 license: MPL-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/stalwart-cli/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Stalwart Labs
 homepage: https://stalw.art
 license: AGPL-3.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/stalwart-foundationdb/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: Stalwart Labs
 homepage: https://stalw.art
 license: AGPL-3.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/stalwart/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: Stalwart Labs
 homepage: https://stalw.art
 license: AGPL-3.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/starship/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: starship
 homepage: https://starship.rs
 license: ISC
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/stern/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: stern
 github: stern/stern
 description: Multi pod and container log tailing for Kubernetes.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: stern
 homepage: https://github.com/stern/stern
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/tea/metadata.yaml

@@ -1,4 +1,3 @@
----
 name: tea
 github: unknown/tea
 description: The official CLI for Gitea.
@@ -7,6 +6,7 @@ platform: linux
 maintainer: Gitea
 homepage: https://gitea.com/gitea/tea
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8
@@ -18,3 +18,10 @@ builds:
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
   version: 0.14.0
+- repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 0.14.0

rpms/terraform/metadata.yaml

@@ -9,6 +9,7 @@ platform: linux
 maintainer: HashiCorp
 homepage: https://terraform.io/
 license: BUSL-1.1
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/terragrunt/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: Gruntwork
 homepage: https://github.com/gruntwork-io/terragrunt
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/tflint/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: Terraform Linters
 homepage: https://github.com/terraform-linters/tflint
 license: MPL-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/unkin-ca-certificates/metadata.yaml

@@ -1,18 +1,27 @@
----
+name: unkin-ca-certificates
+github: unknown/unkin-ca-certificates
+description: ca-certificates for the unkin site
 arch: amd64
+platform: linux
+maintainer: Unkin
+homepage: https://vault.query.consul:8200
+license: Apache-2.0
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 2025.07.13
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
+  version: 2025.07.13
+- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: '1'
+  repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
   version: 2025.07.13
-description: ca-certificates for the unkin site
-github: unknown/unkin-ca-certificates
-homepage: https://vault.query.consul:8200
-license: Apache-2.0
-maintainer: Unkin
-name: unkin-ca-certificates
-platform: linux

rpms/unkin-undionly-kpxe/metadata.yaml

@@ -1,18 +1,20 @@
----
+name: unkin-undionly-kpxe
+github: ipxe/ipxe
+description: iPXE network bootloader
 arch: amd64
+platform: linux
+maintainer: iPXE
+homepage: https://github.com/ipxe/ipxe
+license: GPL-2.0 license
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 20250712.0.2
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: 20250712.0.2
-description: iPXE network bootloader
-github: ipxe/ipxe
-homepage: https://github.com/ipxe/ipxe
-license: GPL-2.0 license
-maintainer: iPXE
-name: unkin-undionly-kpxe
-platform: linux

rpms/unrar/metadata.yaml

@@ -1,18 +1,22 @@
----
+name: unrar
+github: unknown/unrar
+description: WinRAR is a powerful archive manager. It can backup your data and reduce
+  the size of email attachments, open and unpack RAR, ZIP and other files downloaded
+  from Internet, create new archives in RAR and ZIP file format.
 arch: amd64
+platform: linux
+maintainer: RARLAB
+homepage: https://www.rarlab.com/
+license: Freeware (UNRAR 7.11 freeware Copyright (c) 1993-2025 Alexander Roshal)
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: '7.20'
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
   version: '7.20'
-description: WinRAR is a powerful archive manager. It can backup your data and reduce the size of email attachments, open and unpack RAR, ZIP and other files downloaded from Internet, create new archives in RAR and ZIP file format.
-github: unknown/unrar
-homepage: https://www.rarlab.com/
-license: Freeware (UNRAR 7.11 freeware Copyright (c) 1993-2025 Alexander Roshal)
-maintainer: RARLAB
-name: unrar
-platform: linux

rpms/uv/metadata.yaml

@@ -6,14 +6,22 @@ platform: linux
 maintainer: Astral.sh
 homepage: https://docs.astral.sh/uv/
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 0.11.8
+  version: 0.11.14
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 0.11.8
+  version: 0.11.14
+- repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 0.11.14

rpms/vals/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: Helmfile Contributors
 homepage: https://github.com/helmfile/vals
 license: Apache-2.0
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vault/metadata.yaml

@@ -9,6 +9,7 @@ platform: linux
 maintainer: HashiCorp
 homepage: https://github.com/hashicorp/vault
 license: BUSL-1.1
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8
@@ -20,3 +21,10 @@ builds:
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
   version: 2.0.0
+- repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 2.0.0

rpms/vault/resources/build.sh

@@ -6,7 +6,7 @@ set -e
 dnf install -y unzip
 
 # Download and extract vault
-curl -L -o /app/vault.zip https://releases.hashicorp.com/vault/${PACKAGE_VERSION}/vault_${PACKAGE_VERSION}_linux_amd64.zip
+curl -L -o /app/vault.zip https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/hashicorp-releases/vault/${PACKAGE_VERSION}/vault_${PACKAGE_VERSION}_linux_amd64.zip
 unzip vault.zip
 
 # Process the nfpm.yaml template with environment variables

rpms/victoria-logs/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaLogs
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vlutils/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaLogs
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vmagent/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaMetrics
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vmalert/metadata.yaml

@@ -6,6 +6,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaMetrics
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vminsert/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaMetrics
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vmselect/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaMetrics
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vmstorage/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaMetrics
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/vmutils/metadata.yaml

@@ -7,6 +7,7 @@ platform: linux
 maintainer: VictoriaMetrics
 homepage: https://github.com/VictoriaMetrics/VictoriaMetrics
 license: Apache-2.0 license
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8

rpms/xh/metadata.yaml

@@ -1,18 +1,28 @@
----
+name: xh
+github: ducaale/xh
+description: A friendly and fast tool for sending HTTP requests (HTTPie reimplementation
+  in Rust)
 arch: amd64
+platform: linux
+maintainer: ducaale
+homepage: https://github.com/ducaale/xh
+license: MIT
+dist_tag: true
 builds:
 - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el8]
+  repository:
+  - almalinux/el8
   version: 0.25.3
 - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: '1'
-    repository: [almalinux/el9]
+  repository:
+  - almalinux/el9
+  version: 0.25.3
+- repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
   version: 0.25.3
-description: A friendly and fast tool for sending HTTP requests (HTTPie reimplementation in Rust)
-github: ducaale/xh
-homepage: https://github.com/ducaale/xh
-license: MIT
-maintainer: ducaale
-name: xh
-platform: linux

rpms/yq/metadata.yaml

@@ -1,12 +1,13 @@
----
 name: yq
 github: mikefarah/yq
-description: yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties processor.
+description: yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties
+  processor.
 arch: amd64
 platform: linux
 maintainer: mikefarah
 homepage: https://github.com/mikefarah/yq
 license: MIT
+dist_tag: true
 builds:
 - repository:
   - almalinux/el8
@@ -18,3 +19,10 @@ builds:
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
   version: 4.53.2
+- repository:
+  - fedora/42
+  - fedora/43
+  - fedora/44
+  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+  release: 1
+  version: 4.53.2

schema/metadata.json

@@ -0,0 +1,111 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": false,
+  "description": "Schema for rpms/*/metadata.yaml files",
+  "properties": {
+    "arch": {
+      "enum": [
+        "amd64",
+        "arm64",
+        "x86_64"
+      ],
+      "type": "string"
+    },
+    "builds": {
+      "items": {
+        "additionalProperties": false,
+        "properties": {
+          "image": {
+            "minLength": 1,
+            "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_.:/@]+$",
+            "type": "string"
+          },
+          "release": {
+            "oneOf": [
+              {
+                "minLength": 1,
+                "type": "string"
+              },
+              {
+                "type": "number"
+              }
+            ]
+          },
+          "repository": {
+            "items": {
+              "enum": [
+                "almalinux/el8",
+                "almalinux/el9",
+                "fedora/42",
+                "fedora/43",
+                "fedora/44"
+              ],
+              "type": "string"
+            },
+            "minItems": 1,
+            "type": "array"
+          },
+          "version": {
+            "minLength": 1,
+            "pattern": "^[0-9]+(\\.[0-9]+)*(-[a-zA-Z0-9]+)*$",
+            "type": "string"
+          }
+        },
+        "required": [
+          "repository",
+          "image",
+          "release",
+          "version"
+        ],
+        "type": "object"
+      },
+      "minItems": 1,
+      "type": "array"
+    },
+    "description": {
+      "minLength": 1,
+      "type": "string"
+    },
+    "dist_tag": {
+      "type": "boolean"
+    },
+    "github": {
+      "minLength": 1,
+      "pattern": "^[a-zA-Z0-9\\-_]+/[a-zA-Z0-9\\-_.]+$",
+      "type": "string"
+    },
+    "github_release_pattern": {
+      "minLength": 1,
+      "type": "string"
+    },
+    "homepage": {
+      "minLength": 1,
+      "pattern": "^https?://.+",
+      "type": "string"
+    },
+    "license": {
+      "minLength": 1,
+      "type": "string"
+    },
+    "maintainer": {
+      "minLength": 1,
+      "type": "string"
+    },
+    "name": {
+      "minLength": 1,
+      "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_.]*$",
+      "type": "string"
+    },
+    "platform": {
+      "minLength": 1,
+      "type": "string"
+    }
+  },
+  "required": [
+    "name",
+    "description",
+    "builds"
+  ],
+  "title": "RPM Package Metadata",
+  "type": "object"
+}

tests/conftest.py

@@ -0,0 +1,2 @@
+# Tests for tools/build and tools/update-gh.
+# See https://git.unkin.net/unkin/rpmbuilder/issues/162

tests/test_metadata.py

@@ -0,0 +1,36 @@
+"""Validate every rpms/*/metadata.yaml against schema/metadata.json."""
+
+import json
+from pathlib import Path
+
+import jsonschema
+import pytest
+import yaml
+
+REPO_ROOT = Path(__file__).parent.parent
+SCHEMA_FILE = REPO_ROOT / "schema" / "metadata.json"
+RPMS_DIR = REPO_ROOT / "rpms"
+
+
+@pytest.fixture(scope="session")
+def schema():
+    with open(SCHEMA_FILE) as f:
+        return json.load(f)
+
+
+def metadata_files():
+    return sorted(RPMS_DIR.glob("*/metadata.yaml"))
+
+
+@pytest.mark.parametrize("metadata_file", metadata_files(), ids=lambda p: p.parent.name)
+def test_metadata_valid(metadata_file, schema):
+    with open(metadata_file) as f:
+        data = yaml.safe_load(f)
+
+    validator = jsonschema.Draft7Validator(schema)
+    errors = sorted(validator.iter_errors(data), key=str)
+
+    assert not errors, "\n".join(
+        f"  {'.'.join(str(p) for p in e.absolute_path) or '(root)'}: {e.message}"
+        for e in errors
+    )

tools/build

@@ -23,6 +23,8 @@ import sys
 import logging
 import subprocess
 import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
 from pathlib import Path
 from typing import List, Optional
 from concurrent.futures import ThreadPoolExecutor, as_completed
@@ -33,6 +35,36 @@ import yaml
 from cerberus import Validator
 
 
+# ==================== HTTP SESSIONS ====================
+
+def _make_session(retries: int = 3, backoff_factor: float = 0.5) -> requests.Session:
+    """
+    Build a requests Session that retries on transient failures.
+
+    Retries up to `retries` times on connection errors, read timeouts, and
+    5xx / 429 responses, with exponential backoff (0s, 0.5s, 1s, 2s …).
+    Only GET requests are retried to stay safe.
+    """
+    session = requests.Session()
+    retry = Retry(
+        total=retries,
+        backoff_factor=backoff_factor,
+        status_forcelist=[429, 500, 502, 503, 504],
+        allowed_methods=["GET"],
+        raise_on_status=False,
+    )
+    adapter = HTTPAdapter(max_retries=retry)
+    session.mount("https://", adapter)
+    session.mount("http://", adapter)
+    return session
+
+# Shared sessions — one per upstream so connections are pooled and reused
+# across all package checks (including parallel builds in ThreadPoolExecutor).
+# requests.Session is thread-safe for concurrent requests.
+_gitea_session = _make_session()
+_github_session = _make_session()
+
+
 # ==================== VALIDATION SCHEMA ====================
 
 # Cerberus schema for metadata.yaml validation based on PackageMetadata and Build dataclasses
@@ -81,6 +113,11 @@ METADATA_SCHEMA = {
         'required': False,
         'empty': False
     },
+    'dist_tag': {
+        'type': 'boolean',
+        'required': False,
+        'default': False
+    },
     'builds': {
         'type': 'list',
         'required': True,
@@ -94,7 +131,7 @@ METADATA_SCHEMA = {
                     'minlength': 1,
                     'schema': {
                         'type': 'string',
-                        'allowed': ['almalinux/el8', 'almalinux/el9'],
+                        'allowed': ['almalinux/el8', 'almalinux/el9', 'fedora/42', 'fedora/43', 'fedora/44'],
                         'empty': False
                     }
                 },
@@ -146,6 +183,7 @@ class PackageMetadata:
     maintainer: str = ""
     homepage: str = ""
     license: str = ""
+    dist_tag: bool = False
     builds: List[Build] = None
 
     def __post_init__(self):
@@ -274,15 +312,14 @@ def get_github_latest_release(repo: str) -> Optional[dict]:
 
     try:
         github_token = get_github_token()
+        _github_session.headers.update({
+            'Authorization': f'token {github_token}',
+            'Accept': 'application/vnd.github.v3+json',
+        })
 
         url = f"https://api.github.com/repos/{repo}/releases/latest"
-        headers = {
-            'Authorization': f'token {github_token}',
-            'Accept': 'application/vnd.github.v3+json'
-        }
-
         logger.debug(f"Checking GitHub releases: {url}")
-        response = requests.get(url, headers=headers, timeout=30)
+        response = _github_session.get(url, timeout=15)
 
         if response.status_code == 200:
             release = response.json()
@@ -389,15 +426,14 @@ def get_github_releases_by_pattern(repo: str, pattern: str) -> Optional[dict]:
 
     try:
         github_token = get_github_token()
+        _github_session.headers.update({
+            'Authorization': f'token {github_token}',
+            'Accept': 'application/vnd.github.v3+json',
+        })
 
         url = f"https://api.github.com/repos/{repo}/releases"
-        headers = {
-            'Authorization': f'token {github_token}',
-            'Accept': 'application/vnd.github.v3+json'
-        }
-
         logger.debug(f"Checking GitHub releases with pattern '{pattern}': {url}")
-        response = requests.get(url, headers=headers, timeout=30)
+        response = _github_session.get(url, timeout=15)
 
         if response.status_code == 200:
             releases = response.json()
@@ -504,14 +540,45 @@ def normalize_version(version: str) -> str:
     return ''.join(normalized_parts)
 
 
+def get_rpm_dist_tag(distro: str) -> str:
+    """
+    Map a distro path to its RPM dist tag string.
+
+    Examples:
+        'almalinux/el9' -> 'el9'
+        'fedora/43'     -> 'fc43'
+    """
+    if distro.startswith('almalinux/'):
+        return distro.split('/', 1)[1]
+    if distro.startswith('fedora/'):
+        return 'fc' + distro.split('/', 1)[1]
+    return ''
+
+
+def effective_release(base_release: str, distro: str, use_dist_tag: bool) -> str:
+    """Return the release string to use for building and registry checks.
+
+    When use_dist_tag is True the dist tag is appended so different distros
+    produce distinct entries in the package registry (e.g. '1.el9', '1.fc43').
+    """
+    if not use_dist_tag:
+        return base_release
+    tag = get_rpm_dist_tag(distro)
+    return f"{base_release}.{tag}" if tag else base_release
+
+
 def check_package_exists(package_name: str, version: str, release: str) -> bool:
     """
     Check if a package version exists in the Gitea package registry.
 
+    Distro disambiguation is handled by the caller via the release string:
+    when dist_tag is enabled the caller appends the dist tag to release
+    (e.g. '1.el9', '1.fc43') so each distro maps to a unique version entry.
+
     Args:
         package_name: Name of the package
         version: Version string
-        release: Release number
+        release: Effective release (may include dist tag suffix)
 
     Returns:
         True if package exists, False otherwise
@@ -536,17 +603,17 @@ def check_package_exists(package_name: str, version: str, release: str) -> bool:
             f"{package_type}/{package_name}/{full_version}"
         )
 
-        headers = {'Authorization': f'token {gitea_token}'}
+        _gitea_session.headers.update({'Authorization': f'token {gitea_token}'})
 
         logger.debug(f"Checking package existence: {url}")
-        response = requests.get(url, headers=headers, timeout=30)
+        response = _gitea_session.get(url, timeout=10)
 
         if response.status_code == 200:
             package_info = response.json()
-            # Package exists if we get package info back
             exists = bool(package_info.get('id'))
             logger.debug(f"Package {package_name}:{full_version} {'exists' if exists else 'not found'}")
             return exists
+
         elif response.status_code == 404:
             logger.debug(f"Package {package_name}:{full_version} not found (404)")
             return False
@@ -1241,6 +1308,7 @@ class Builder:
 
                 package_name = metadata.get('name', package_dir.name)
                 build_configs = metadata.get('builds', [])
+                use_dist_tag = metadata.get('dist_tag', False)
 
                 if not build_configs:
                     self.logger.warning(f"No builds in metadata.yaml for {package_name}")
@@ -1259,7 +1327,8 @@ class Builder:
                             if repositories and base_image and version and release:
                                 # Use the first repository as the distro identifier
                                 build_distro = repositories[0] if repositories else 'unknown'
-                                packages.append(PackageInfo(package_name, version, str(release), package_dir, build_distro, base_image))
+                                rel = effective_release(str(release), build_distro, use_dist_tag)
+                                packages.append(PackageInfo(package_name, version, rel, package_dir, build_distro, base_image))
                 else:
                     # Build for specific distro
                     for build_config in build_configs:
@@ -1271,7 +1340,8 @@ class Builder:
 
                             # Check if the target distro matches any repository
                             if distro in repositories and base_image and version and release:
-                                packages.append(PackageInfo(package_name, version, str(release), package_dir, distro, base_image))
+                                rel = effective_release(str(release), distro, use_dist_tag)
+                                packages.append(PackageInfo(package_name, version, rel, package_dir, distro, base_image))
                                 break
                     else:
                         # If no matching distro found, log a warning
@@ -1324,6 +1394,8 @@ class Builder:
             with open(metadata_file, 'r') as f:
                 metadata = yaml.safe_load(f)
 
+            use_dist_tag = metadata.get('dist_tag', False)
+
             # Find base image and validate version/release for the specified distro
             build_configs = metadata.get('builds', [])
             base_image = None
@@ -1367,7 +1439,8 @@ class Builder:
             self.logger.error(f"Error reading metadata.yaml for {package}: {e}")
             return False
 
-        package_info = PackageInfo(package, version, release, package_dir, distro, base_image)
+        rel = effective_release(release, distro, use_dist_tag)
+        package_info = PackageInfo(package, version, rel, package_dir, distro, base_image)
         return self._build_package(package_info, dry_run, force, native, buildah)
 
     def build_all(self, dry_run: bool = False, force: bool = False, parallel: int = 4, distro: str = 'el/9', native: bool = False, buildah: bool = False) -> bool: