particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/fedora: drop package set name translations

Browse source 
No longer name the packageSetChains after the package set, but
keep them named after the pipelines. This should be a
non-functional change as dnf-json does not care about what the
chains are called, only that the names are unique.
This commit is contained in:
Tom Gundersen 2022-07-01 00:11:11 +01:00
parent e6bc7dea18
commit 83e2060976
72 changed files with 35513 additions and 35537 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/distro/distro_test.go
View file

@ -126,6 +126,19 @@ func TestImageType_PackageSetsChains(t *testing.T) {
}, nil)
for packageSetName := range imageType.PackageSetsChains() {
_, ok := imagePkgSets[packageSetName]
if !ok {
// in the new pipeline generation logic the name of the package
// set chains are taken from the pipelines and do not match the
// package set names.
// TODO: redefine package set chains to make this unneccesary
switch packageSetName {
case "packages":
_, ok = imagePkgSets["os"]
if !ok {
_, ok = imagePkgSets["ostree-tree"]
}
}
}
assert.Truef(t, ok, "package set %q defined in a package set chain is not present in the image package sets", packageSetName)
}
})

32
internal/distro/distro_test_common/distro_test_common.go
View file

@ -191,24 +191,28 @@ func kernelCount(imgType distro.ImageType) int {
},
}, nil)
n := 0
for _, pset := range sets["packages"] {
for _, pkg := range pset.Include {
for _, kernel := range knownKernels {
if kernel == pkg {
n++
for _, name := range []string{
"os", "ostree-tree", "anaconda-tree",
"packages", "installer",
} {
for _, pset := range sets[name] {
for _, pkg := range pset.Include {
for _, kernel := range knownKernels {
if kernel == pkg {
n++
}
}
}
}
}
for _, iset := range sets["installer"] {
for _, pkg := range iset.Include {
for _, kernel := range knownKernels {
if kernel == pkg {
n++
}
}
}
if n > 0 {
// BUG: some RHEL image types contain both 'packages'
// and 'installer' even though only 'installer' is used
// this counts the kernel package twice. None of these
// sets should appear more than once, so return the count
// for the first one that has a kernel.
return n
}
}
return n
}

47
internal/distro/fedora/distro.go
View file

@ -635,30 +635,7 @@ func (t *imageType) PackageSets(bp blueprint.Blueprint, options distro.ImageOpti
return nil
}
manifestChains := manifest.GetPackageSetChains()
// the returned package set chains are indexed by pipeline
// name, we need to reindex by package set name
// TODO: drop translation, see Manifest()
distroChains := make(map[string][]rpmmd.PackageSet)
for name, chain := range manifestChains {
switch name {
case "os":
name = osPkgsKey
case "ostree-tree":
name = osPkgsKey
case "container-tree":
name = containerPkgsKey
case "anaconda-tree":
name = installerPkgsKey
case "build":
name = buildPkgsKey
default:
panic(fmt.Sprintf("unknown pacakge set name: %s", name))
}
distroChains[name] = chain
}
return distroChains
return manifest.GetPackageSetChains()
}
func (t *imageType) BuildPipelines() []string {
@ -762,7 +739,7 @@ func (t *imageType) initializeManifest(customizations *blueprint.Customizations,
func (t *imageType) Manifest(customizations *blueprint.Customizations,
options distro.ImageOptions,
repos []rpmmd.RepoConfig,
distroPackageSets map[string][]rpmmd.PackageSpec,
packageSets map[string][]rpmmd.PackageSpec,
seed int64) (distro.Manifest, error) {
manifest, err := t.initializeManifest(customizations, options, repos, nil, seed)
@ -770,25 +747,7 @@ func (t *imageType) Manifest(customizations *blueprint.Customizations,
return distro.Manifest{}, err
}
// TODO: drop transaltion, see GetPackageSets()
manifestPackageSets := make(map[string][]rpmmd.PackageSpec)
for name, set := range distroPackageSets {
switch name {
case osPkgsKey:
manifestPackageSets["os"] = set
manifestPackageSets["ostree-tree"] = set
case containerPkgsKey:
manifestPackageSets["container-tree"] = set
case installerPkgsKey:
manifestPackageSets["anaconda-tree"] = set
case buildPkgsKey:
manifestPackageSets["build"] = set
default:
panic(fmt.Sprintf("unknown pacakge set name: %s", name))
}
}
return manifest.Serialize(manifestPackageSets)
return manifest.Serialize(packageSets)
}
func isMountpointAllowed(mountpoint string) bool {

2
test/data/manifests/fedora_34-aarch64-ami-boot.json
View file

@ -8206,7 +8206,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-aarch64-container-boot.json
View file

@ -5941,7 +5941,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "alternatives",
"epoch": 0,

2
test/data/manifests/fedora_34-aarch64-fedora_iot_commit-boot.json
View file

@ -9081,7 +9081,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "acl",
"epoch": 0,

4
test/data/manifests/fedora_34-aarch64-fedora_iot_container-boot.json
View file

@ -10637,7 +10637,7 @@
"check_gpg": true
}
],
"container": [
"container-tree": [
{
"name": "acl",
"epoch": 0,
@ -12419,7 +12419,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "acl",
"epoch": 0,

5566
test/data/manifests/fedora_34-aarch64-fedora_iot_installer-boot.json
View file

File diff suppressed because it is too large Load diff

5566
test/data/manifests/fedora_34-aarch64-fedora_iot_installer_with_users-boot.json
View file

File diff suppressed because it is too large Load diff

2
test/data/manifests/fedora_34-aarch64-oci-boot.json
View file

@ -8122,7 +8122,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-aarch64-openstack-boot.json
View file

@ -8472,7 +8472,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-aarch64-qcow2-boot.json
View file

@ -8146,7 +8146,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-aarch64-qcow2_customize-boot.json
View file

@ -8467,7 +8467,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-ami-boot.json
View file

@ -8243,7 +8243,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-container-boot.json
View file

@ -6004,7 +6004,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "alternatives",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json
View file

@ -9256,7 +9256,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json
View file

@ -9262,7 +9262,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "acl",
"epoch": 0,

4
test/data/manifests/fedora_34-x86_64-fedora_iot_container-boot.json
View file

@ -10820,7 +10820,7 @@
"check_gpg": true
}
],
"container": [
"container-tree": [
{
"name": "acl",
"epoch": 0,
@ -12612,7 +12612,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "acl",
"epoch": 0,

5706
test/data/manifests/fedora_34-x86_64-fedora_iot_installer-boot.json
View file

File diff suppressed because it is too large Load diff

5706
test/data/manifests/fedora_34-x86_64-fedora_iot_installer_with_users-boot.json
View file

File diff suppressed because it is too large Load diff

2
test/data/manifests/fedora_34-x86_64-oci-boot.json
View file

@ -8291,7 +8291,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-openstack-boot.json
View file

@ -8575,7 +8575,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-qcow2-boot.json
View file

@ -8315,7 +8315,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-qcow2_customize-boot.json
View file

@ -8636,7 +8636,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-vhd-boot.json
View file

@ -8071,7 +8071,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_34-x86_64-vmdk-boot.json
View file

@ -8314,7 +8314,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-aarch64-ami-boot.json
View file

@ -8449,7 +8449,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-aarch64-container-boot.json
View file

@ -6027,7 +6027,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "alternatives",
"epoch": 0,

2
test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json
View file

@ -9152,7 +9152,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

4
test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json
View file

@ -10681,7 +10681,7 @@
"check_gpg": true
}
],
"container": [
"container-tree": [
{
"name": "acl",
"epoch": 0,
@ -12433,7 +12433,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

5686
test/data/manifests/fedora_35-aarch64-fedora_iot_installer-boot.json
View file

File diff suppressed because it is too large Load diff

5686
test/data/manifests/fedora_35-aarch64-fedora_iot_installer_with_users-boot.json
View file

File diff suppressed because it is too large Load diff

2
test/data/manifests/fedora_35-aarch64-oci-boot.json
View file

@ -8431,7 +8431,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-aarch64-openstack-boot.json
View file

@ -8715,7 +8715,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-aarch64-qcow2-boot.json
View file

@ -8455,7 +8455,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json
View file

@ -8754,7 +8754,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-ami-boot.json
View file

@ -8486,7 +8486,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-container-boot.json
View file

@ -6090,7 +6090,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "alternatives",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json
View file

@ -9327,7 +9327,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json
View file

@ -9333,7 +9333,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

4
test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json
View file

@ -10864,7 +10864,7 @@
"check_gpg": true
}
],
"container": [
"container-tree": [
{
"name": "acl",
"epoch": 0,
@ -12626,7 +12626,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

5826
test/data/manifests/fedora_35-x86_64-fedora_iot_installer-boot.json
View file

File diff suppressed because it is too large Load diff

5826
test/data/manifests/fedora_35-x86_64-fedora_iot_installer_with_users-boot.json
View file

File diff suppressed because it is too large Load diff

2
test/data/manifests/fedora_35-x86_64-oci-boot.json
View file

@ -8633,7 +8633,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-openstack-boot.json
View file

@ -8818,7 +8818,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-qcow2-boot.json
View file

@ -8657,7 +8657,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json
View file

@ -8956,7 +8956,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-vhd-boot.json
View file

@ -8292,7 +8292,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "WALinuxAgent",
"epoch": 0,

2
test/data/manifests/fedora_35-x86_64-vmdk-boot.json
View file

@ -8656,7 +8656,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "acl",
"epoch": 0,

2
test/data/manifests/fedora_36-aarch64-ami-boot.json
View file

@ -8890,7 +8890,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "ModemManager-glib",
"epoch": 0,

2
test/data/manifests/fedora_36-aarch64-container-boot.json
View file

@ -6063,7 +6063,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "alternatives",
"epoch": 0,

2
test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json
View file

@ -9609,7 +9609,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

4
test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json
View file

@ -11128,7 +11128,7 @@
"check_gpg": true
}
],
"container": [
"container-tree": [
{
"name": "alternatives",
"epoch": 0,
@ -12870,7 +12870,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

6246
test/data/manifests/fedora_36-aarch64-fedora_iot_installer-boot.json
View file

File diff suppressed because it is too large Load diff

6246
test/data/manifests/fedora_36-aarch64-fedora_iot_installer_with_users-boot.json
View file

File diff suppressed because it is too large Load diff

2
test/data/manifests/fedora_36-aarch64-oci-boot.json
View file

@ -8828,7 +8828,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "ModemManager-glib",
"epoch": 0,

2
test/data/manifests/fedora_36-aarch64-openstack-boot.json
View file

@ -9156,7 +9156,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "ModemManager-glib",
"epoch": 0,

2
test/data/manifests/fedora_36-aarch64-qcow2-boot.json
View file

@ -8852,7 +8852,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "ModemManager-glib",
"epoch": 0,

2
test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json
View file

@ -9386,7 +9386,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "ModemManager-glib",
"epoch": 0,

2
test/data/manifests/fedora_36-x86_64-ami-boot.json
View file

@ -8515,7 +8515,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "NetworkManager",
"epoch": 1,

2
test/data/manifests/fedora_36-x86_64-container-boot.json
View file

@ -6165,7 +6165,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "alternatives",
"epoch": 0,

2
test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json
View file

@ -9802,7 +9802,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

2
test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json
View file

@ -9808,7 +9808,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

4
test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json
View file

@ -11337,7 +11337,7 @@
"check_gpg": true
}
],
"container": [
"container-tree": [
{
"name": "alternatives",
"epoch": 0,
@ -13099,7 +13099,7 @@
"check_gpg": true
}
],
"packages": [
"ostree-tree": [
{
"name": "ModemManager",
"epoch": 0,

6386
test/data/manifests/fedora_36-x86_64-fedora_iot_installer-boot.json
View file

File diff suppressed because it is too large Load diff

6386
test/data/manifests/fedora_36-x86_64-fedora_iot_installer_with_users-boot.json
View file

File diff suppressed because it is too large Load diff

2
test/data/manifests/fedora_36-x86_64-oci-boot.json
View file

@ -8618,7 +8618,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "NetworkManager",
"epoch": 1,

2
test/data/manifests/fedora_36-x86_64-openstack-boot.json
View file

@ -8847,7 +8847,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "NetworkManager",
"epoch": 1,

2
test/data/manifests/fedora_36-x86_64-qcow2-boot.json
View file

@ -8642,7 +8642,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "NetworkManager",
"epoch": 1,

2
test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json
View file

@ -9165,7 +9165,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "NetworkManager",
"epoch": 1,

2
test/data/manifests/fedora_36-x86_64-vhd-boot.json
View file

@ -8332,7 +8332,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "NetworkManager",
"epoch": 1,

2
test/data/manifests/fedora_36-x86_64-vmdk-boot.json
View file

@ -8641,7 +8641,7 @@
"check_gpg": true
}
],
"packages": [
"os": [
{
"name": "NetworkManager",
"epoch": 1,