buildbot: sign APK index file

freifunk-berlin · Nov 14, 2024 · dfdbefe · dfdbefe
1 parent c7a72da
commit dfdbefe
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/roles/buildbot/files/packages.py b/roles/buildbot/files/packages.py
@@ -110,6 +110,14 @@ def branchToFalterBranch(props):
     }
     return o2f.get(props["branch"])
 
+@util.renderer
+def signCommand(props, wwwdir):
+    match props["branch"]:
+        case "openwrt-24.10" | "openwrt-23.05" | "openwrt-22.03" | "openwrt-21.02":
+            return f"signify-openbsd -S -m {wwwdir}/falter/Packages -s packagefeed_master.sec"
+        case _:
+            return f"apk adbsign --allow-untrusted --sign-key apk.snapshot.PRIVATE.pem {wwwdir}/falter/packages.adb"
+
 
 # Fans out to one builder per arch and blocks for the results.
 def packagesFactory(f, wwwPrefix):
@@ -292,10 +300,7 @@ def packagesArchFactory(f, wwwPrefix, wwwURL, alpineVersion):
             command=[
                 "sh",
                 "-c",
-                util.Interpolate(
-                    "signify-openbsd -S -m %(kw:wwwdir)s/falter/Packages -s packagefeed_master.sec",
-                    wwwdir=wwwdir,
-                ),
+                signCommand.withArgs(wwwdir)
             ],
         )
     )
@@ -304,11 +309,7 @@ def packagesArchFactory(f, wwwPrefix, wwwURL, alpineVersion):
             name="cleanup master",
             alwaysRun=True,
             warnOnFailure=False,
-            command=[
-                "sh",
-                "-c",
-                util.Interpolate("rm -vf %(kw:tarfile)s", tarfile=tarfile),
-            ],
+            command=["sh", "-c", util.Interpolate("rm -vf %(kw:tarfile)s", tarfile=tarfile)],
         )
     )
     f.addStep(