Support Architect-Variant fields

Author: hstct

pulp_deb/app/migrations/0035_alter_packagereleasecomponent_unique_together_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.2.10 on 2026-02-19 10:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deb', '0034_aptpublication_layout'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='packagereleasecomponent',
+            unique_together=set(),
+        ),
+        migrations.AddField(
+            model_name='packagereleasecomponent',
+            name='index_architecture',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='releasearchitecture',
+            name='base_architecture',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='releasearchitecture',
+            name='variant_architecture',
+            field=models.TextField(null=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='packagereleasecomponent',
+            unique_together={('package', 'release_component', 'index_architecture', '_pulp_domain')},
+        ),
+    ]

pulp_deb/app/models/content/content.py

@@ -78,7 +78,9 @@ def name(self):
         """Print a nice name for Packages."""
         return "{}_{}_{}".format(self.package, self.version, self.architecture)
 
-    def filename(self, component="", layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY):
+    def filename(
+        self, component="", layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY, basename_override=None
+    ):
         """Assemble filename in pool directory."""
         sourcename = self.source or self.package
         sourcename = sourcename.split("(", 1)[0].rstrip()
@@ -87,13 +89,15 @@ def filename(self, component="", layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY):
         else:
             prefix = sourcename[0]
         path = os.path.join("pool", component, prefix, sourcename)
+
+        basename = basename_override or "{}.{}".format(self.name, self.SUFFIX)
         if layout == LAYOUT_TYPES.NESTED_ALPHABETICALLY:
-            return os.path.join(path, "{}.{}".format(self.name, self.SUFFIX))
+            return os.path.join(path, basename)
         else:  # NESTED_BY_DIGEST or NESTED_BY_BOTH. The primary URL in BOTH is by digest.
             return os.path.join(
                 path,
                 "by-digest",
-                "{}-{}.{}".format(self.sha256[0:6], self.name, self.SUFFIX),
+                "{}-{}".format(self.sha256[0:6], basename),
             )
 
     class Meta:

pulp_deb/app/models/content/structure_content.py

@@ -40,6 +40,8 @@ class ReleaseArchitecture(Content):
 
     distribution = models.TextField()
     architecture = models.TextField()
+    base_architecture = models.TextField(null=True)
+    variant_architecture = models.TextField(null=True)
     _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
 
     class Meta:
@@ -94,11 +96,12 @@ class PackageReleaseComponent(Content):
 
     package = models.ForeignKey(Package, on_delete=models.CASCADE)
     release_component = models.ForeignKey(ReleaseComponent, on_delete=models.CASCADE)
+    index_architecture = models.TextField(null=True)
     _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = (("package", "release_component", "_pulp_domain"),)
+        unique_together = (("package", "release_component", "index_architecture", "_pulp_domain"),)
 
 
 class SourcePackageReleaseComponent(Content):

pulp_deb/app/serializers/content_serializers.py

@@ -485,6 +485,7 @@ def to822(
         artifact_dict=None,
         remote_artifact_dict=None,
         layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY,
+        basename_override=None,
     ):
         """Create deb822.Package object from model."""
         ret = deb822.Packages()
@@ -509,7 +510,15 @@ def to822(
             ret.update({"SHA1": artifact.sha1} if artifact.sha1 else {})
             ret.update({"SHA256": artifact.sha256})
             ret.update({"Size": str(artifact.size)})
-        ret.update({"Filename": self.instance.filename(component, layout=layout)})
+        ret.update(
+            {
+                "Filename": self.instance.filename(
+                    component,
+                    layout=layout,
+                    basename_override=basename_override,
+                )
+            }
+        )
 
         return ret
 

pulp_deb/app/serializers/remote_serializers.py

@@ -1,10 +1,14 @@
-from rest_framework.serializers import BooleanField, CharField, ChoiceField
+import re
+from rest_framework.serializers import BooleanField, CharField, ChoiceField, ValidationError
 
 from pulpcore.plugin.models import Remote
 from pulpcore.plugin.serializers import RemoteSerializer
 
 from pulp_deb.app.models import AptRemote
 
+ARCH_RE = re.compile(r"^[A-Za-z0-9_+-]+$")
+ARCH_VARIANT_RE = re.compile(r"^[A-Za-z0-9_+-]+:[A-Za-z0-9_+-]+$")
+
 
 class AptRemoteSerializer(RemoteSerializer):
     """
@@ -83,3 +87,30 @@ class Meta:
             "ignore_missing_package_indices",
         )
         model = AptRemote
+
+    def validate_architectures(self, value):
+        if value in (None, ""):
+            return value
+
+        tokens = value.split()
+        seen_tokens = set()
+        for token in tokens:
+            if token in seen_tokens:
+                raise ValidationError(f"Duplicate architecture token '{token}'.")
+            seen_tokens.add(token)
+
+            if not (ARCH_RE.match(token) or ARCH_VARIANT_RE.match(token)):
+                raise ValidationError(
+                    f"Invalid architecture token '{token}'. Use 'amd64' or 'amd64:v3' style."
+                )
+            base, var = _parse_arch_token(token)
+            if not base:
+                raise ValidationError(f"Invalid architecture token '{token}'.")
+        return value
+
+
+def _parse_arch_token(token):
+    if ":" not in token:
+        return token, None
+    base, var = token.split(":", 1)
+    return base, var

pulp_deb/app/tasks/publishing.py

@@ -195,14 +195,16 @@ def publish(
 
                 release_helpers = []
                 for distribution in distributions:
+                    release_arch_qs = ReleaseArchitecture.objects.filter(
+                        pk__in=repo_version.content.order_by("-pulp_created"),
+                        distribution=distribution,
+                    )
                     architectures = list(
-                        ReleaseArchitecture.objects.filter(
-                            pk__in=repo_version.content.order_by("-pulp_created"),
-                            distribution=distribution,
+                        release_arch_qs.distinct("architecture").values_list(
+                            "architecture", flat=True
                         )
-                        .distinct("architecture")
-                        .values_list("architecture", flat=True)
                     )
+
                     if "all" not in architectures:
                         architectures.append("all")
 
@@ -268,16 +270,27 @@ def publish(
                     )
 
                     for component in components:
+                        prcs_for_component = [
+                            prc
+                            for prc in package_release_components
+                            if prc.release_component.component == component
+                        ]
                         packages = Package.objects.filter(
-                            pk__in=[
-                                prc.package.pk
-                                for prc in package_release_components
-                                if prc.release_component.component == component
-                            ]
+                            pk__in=[prc.package.pk for prc in prcs_for_component]
                         ).prefetch_related("contentartifact_set", "_artifacts")
                         artifact_dict, remote_artifact_dict = _batch_fetch_artifacts(packages)
+
+                        pkg_by_pk = {p.pk: p for p in packages}
+                        package_pairs = [
+                            (
+                                pkg_by_pk[prc.package.pk],
+                                prc.index_architecture or pkg_by_pk[prc.package.pk].architecture,
+                            )
+                            for prc in prcs_for_component
+                            if prc.package.pk in pkg_by_pk
+                        ]
                         release_helper.components[component].add_packages(
-                            packages,
+                            package_pairs,
                             artifact_dict,
                             remote_artifact_dict,
                         )
@@ -338,56 +351,74 @@ def __init__(self, parent, component):
             source_index_path,
         )
 
-    def add_packages(self, packages, artifact_dict, remote_artifact_dict):
+    def add_packages(self, package_pairs, artifact_dict, remote_artifact_dict):
         published_artifacts = []
-        package_data = []
+        packages = [p for (p, _idx) in package_pairs]
 
         content_artifacts = {
             package.pk: list(package.contentartifact_set.all()) for package in packages
         }
         layout = self.parent.publication.layout
 
-        for package in packages:
+        for package, index_arch in package_pairs:
             with suppress(IntegrityError):
                 content_artifact = content_artifacts.get(package.pk, [None])[0]
+                if content_artifact is None:
+                    continue
+
+                upstream_basename = os.path.basename(content_artifact.relative_path)
+
+                primary_relpath = package.filename(
+                    self.component, layout=layout, basename_override=upstream_basename
+                )
                 published_artifact = PublishedArtifact(
-                    relative_path=package.filename(self.component, layout=layout),
+                    relative_path=primary_relpath,
                     publication=self.parent.publication,
                     content_artifact=content_artifact,
                 )
                 published_artifacts.append(published_artifact)
-                package_data.append((package, package.architecture))
+
                 # In the NESTED_BY_BOTH layout, we want to _also_ publish the package under the
                 # alphabetical path but _not_ reference it in the repo metadata.
                 if layout == LAYOUT_TYPES.NESTED_BY_BOTH:
-                    alt_published_artifact = PublishedArtifact(
-                        relative_path=package.filename(
-                            self.component, layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY
-                        ),
-                        publication=self.parent.publication,
-                        content_artifact=content_artifact,
+                    alt_relpath = package.filename(
+                        self.component,
+                        layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY,
+                        basename_override=upstream_basename,
                     )
-                    published_artifacts.append(alt_published_artifact)
+                    published_artifacts.append(
+                        PublishedArtifact(
+                            relative_path=alt_relpath,
+                            publication=self.parent.publication,
+                            content_artifact=content_artifact,
+                        )
+                    )
+
+                package_serializer = Package822Serializer(package, context={"request": None})
+                try:
+                    package_serializer.to822(
+                        self.component,
+                        artifact_dict,
+                        remote_artifact_dict,
+                        layout=layout,
+                        basename_override=upstream_basename,
+                    ).dump(self.package_index_files[index_arch][0])
+                except KeyError:
+                    log.warning(
+                        "Published package '%s' with index architecture '%s' was not added to "
+                        "component '%s' in distribution '%s' because it lacks this architecture!",
+                        getattr(package, "relative_path", None) or getattr(package, "pk", None),
+                        index_arch,
+                        self.component,
+                        self.parent.distribution,
+                    )
+                else:
+                    self.package_index_files[index_arch][0].write(b"\n")
 
         with transaction.atomic():
             if published_artifacts:
                 PublishedArtifact.objects.bulk_create(published_artifacts, ignore_conflicts=True)
 
-        for package, architecture in package_data:
-            package_serializer = Package822Serializer(package, context={"request": None})
-            try:
-                package_serializer.to822(
-                    self.component, artifact_dict, remote_artifact_dict, layout=layout
-                ).dump(self.package_index_files[architecture][0])
-            except KeyError:
-                log.warn(
-                    f"Published package '{package.relative_path}' with architecture "
-                    f"'{architecture}' was not added to component '{self.component}' in "
-                    f"distribution '{self.parent.distribution}' because it lacks this architecture!"
-                )
-            else:
-                self.package_index_files[architecture][0].write(b"\n")
-
     # Publish DSC file and setup to create Sources Indices file
     def add_source_packages(self, source_packages):
         published_artifacts = []