chore: update build tool, puppet-initial

- update build tool with github_release_pattern
- update puppet-initial to reduce impact on upgrades

.gitea/workflows/build.yaml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: rpms-8
-          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
+          path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm
 
   build-9:
     runs-on: almalinux-8
@@ -56,4 +56,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: rpms-9
-          path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
+          path: /workspace/unkin/rpmbuilder/dist/*/*/*.rpm

rpms/boilerplate/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.10.1
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.10.1

rpms/cni-plugins/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.9.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.9.0

rpms/consul/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.22.2
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.22.2

rpms/etcd/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 3.6.7
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 3.6.7

rpms/exportarr/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 2.3.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 2.3.0

rpms/frr_exporter/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.9.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.9.0

rpms/helmfile/metadata.yaml

@@ -12,10 +12,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.2.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.2.3

rpms/incus/metadata.yaml

@@ -1,14 +1,14 @@
 name: incus
 github: lxc/incus
-description: incus package
+description: Powerful system container and virtual machine manager
 arch: amd64
 platform: linux
-maintainer: ''
+maintainer: unkin
-homepage: ''
+homepage: https://linuxcontainers.org/incus/
-license: ''
+license: Apache-2.0
 builds:
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 6.20.0

rpms/jellyfin-ffmpeg-bin/metadata.yaml

@@ -1,11 +1,11 @@
 name: jellyfin-ffmpeg-bin
 github: jellyfin/jellyfin-ffmpeg
-description: jellyfin-ffmpeg-bin package
+description: FFmpeg binary package optimized for Jellyfin media server
 arch: amd64
 platform: linux
-maintainer: ''
+maintainer: unkin
-homepage: ''
+homepage: https://github.com/jellyfin/jellyfin-ffmpeg
-license: ''
+license: GPL-3.0
 builds:
 - repository:
   - almalinux/el8

rpms/nfpm/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 2.44.1
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 2.44.1

rpms/node_exporter/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.10.2
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.10.2

rpms/nomad-autoscaler/metadata.yaml

@@ -12,10 +12,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.4.8
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.4.8

rpms/nzbget/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 2-el8
+  release: 2
   version: '25.4'
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 2-el9
+  release: 2
   version: '25.4'

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

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.1.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.1.0

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

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.1.5
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.1.5

rpms/openbao-plugins/metadata.yaml

@@ -1,4 +1,5 @@
 name: openbao-plugins
+github: openbao/openbao-plugins
 description: Meta package that installs all OpenBao plugins
 arch: amd64
 platform: linux
@@ -9,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.0.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.0.0

rpms/packer/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.14.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.14.3

rpms/postgres_exporter/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.18.1
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.18.1

rpms/puppet-initial/resources/scripts/postinstall.sh

@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
-systemctl daemon-reload
+# Only run on fresh install, not upgrade
-systemctl enable puppet-initial.service
+if [ "$1" -eq 1 ]; then
+    systemctl daemon-reload
+    systemctl enable puppet-initial.service
+fi

rpms/puppet-initial/resources/scripts/preinstall.sh

@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
-systemctl stop puppet
+# Only run on fresh install, not upgrade
-systemctl disable puppet
+if [ "$1" -eq 1 ]; then
+    systemctl stop puppet
+    systemctl disable puppet
+fi

rpms/ruff/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.14.10
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.14.10

rpms/stalwart-cli/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.15.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.15.3

rpms/stalwart-foundationdb/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.15.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.15.3

rpms/stalwart/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.15.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.15.3

rpms/terraform/metadata.yaml

@@ -13,10 +13,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.14.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.14.3

rpms/terragrunt/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.96.1
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.96.1

rpms/tflint/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.60.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.60.0

rpms/uv/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.9.20
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.9.20

rpms/vals/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 0.43.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 0.43.0

rpms/vault/metadata.yaml

@@ -13,10 +13,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.21.1
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.21.1

rpms/victoria-logs/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.43.1
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.43.1

rpms/vlutils/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.43.1
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.43.1

rpms/vmagent/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.132.0

rpms/vmalert/metadata.yaml

@@ -10,10 +10,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.132.0

rpms/vminsert/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.132.0

rpms/vmselect/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.132.0

rpms/vmstorage/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.132.0

rpms/vmutils/metadata.yaml

@@ -11,10 +11,10 @@ builds:
 - repository:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1-el8
+  release: 1
   version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1-el9
+  release: 1
   version: 1.132.0

tools/build

@@ -105,7 +105,7 @@ METADATA_SCHEMA = {
                     'regex': r'^[a-zA-Z0-9\-_\.:\/]+$'
                 },
                 'release': {
-                    'type': 'string',
+                    'type': ['string', 'integer', 'float'],
                     'required': True,
                     'empty': False
                 },
@@ -117,6 +117,11 @@ METADATA_SCHEMA = {
                 }
             }
         }
+    },
+    'github_release_pattern': {
+        'type': 'string',
+        'required': False,
+        'empty': False
     }
 }
 
@@ -623,6 +628,7 @@ def build_package_docker(
     package_version: str,
     package_release: str,
     dist_dir: Path,
+    repository: str,
     base_image: str = "git.unkin.net/unkin/almalinux9-rpmbuilder:latest",
     dry_run: bool = False
 ) -> bool:
@@ -635,6 +641,7 @@ def build_package_docker(
         package_version: Package version
         package_release: Package release number
         dist_dir: Directory to store built packages
+        repository: Repository path (e.g., 'almalinux/el9')
         base_image: Base Docker image to use for building
         dry_run: If True, only show what would be done
 
@@ -644,8 +651,8 @@ def build_package_docker(
     logger = logging.getLogger(__name__)
 
     try:
-        # Ensure dist directory exists
+        # Ensure dist directory exists with repository structure
-        package_dist_dir = dist_dir / package_name
+        package_dist_dir = dist_dir / repository / package_name
         if not dry_run:
             package_dist_dir.mkdir(parents=True, exist_ok=True)
 
@@ -1085,6 +1092,7 @@ class Builder:
                 package_version=package_info.version,
                 package_release=package_info.release,
                 dist_dir=self.dist_dir,
+                repository=package_info.distro,
                 base_image=package_info.base_image,
                 dry_run=dry_run
             )