diff --git a/britney.conf b/britney.conf index d0c24f0..da92134 100644 --- a/britney.conf +++ b/britney.conf @@ -24,7 +24,7 @@ STATE_DIR = data/%(SERIES)/state # List of architectures that Britney should consider. # - defaults to the value in testing's Release file (if it is present). # - Required for the legacy layout. -ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el riscv64 +ARCHITECTURES = amd64 amd64v3 arm64 armhf i386 powerpc ppc64el riscv64 # if you're not in this list, arch: all packages are allowed to break on you NOBREAKALL_ARCHES = amd64 @@ -39,7 +39,7 @@ HAS_ARCH_ALL_BUILDDS = no OUTOFSYNC_ARCHES = # if you're in this list, your uninstallability count may increase -BREAK_ARCHES = +BREAK_ARCHES = amd64v3 # if you're in this list, you are a new architecture NEW_ARCHES = diff --git a/britney2/inputs/suiteloader.py b/britney2/inputs/suiteloader.py index 964f239..5fc9332 100644 --- a/britney2/inputs/suiteloader.py +++ b/britney2/inputs/suiteloader.py @@ -382,6 +382,11 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader): provides = [] raw_arch = intern(get_field('Architecture')) + # FIXME: Make this configurable. + # If a base architecture is used in an architecture variant package file, promote + # it to the variant architecture. + if arch == "amd64v3" and raw_arch == "amd64": + raw_arch = "amd64v3" if raw_arch not in {'all', arch}: # pragma: no cover raise AssertionError("%s has wrong architecture (%s) - should be either %s or all" % ( str(pkg_id), raw_arch, arch))