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

tests/dnf: always specify platform_module_id

Browse source 
As long as this matches the build environment, this does not make
a differenece, but let us not depend on this.

This will be useful when automatically transforming dnf to rpm
pipelines, as the platform_module_id is needed as input to
osbuild-composer's dnf-json tool.

Performed using this script:

```

cat $1 | jq '(.stages[]? | select(.name == "org.osbuild.dnf") | .options.module_platform_id) |= . + "platform:f30"'  | sponge $1
cat $1 | jq '(.build.pipeline.stages[]? | select(.name == "org.osbuild.dnf") | .options.module_platform_id) |= . + "platform:f30"'  | sponge $1
```

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-02-26 16:30:37 +01:00
parent a1540fd32d
commit ff8fda9e53
38 changed files with 211 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

24
samples/base-qcow2.json
View file

@ -7,7 +7,7 @@
"basearch": "x86_64",
"install_weak_deps": true,
"repos": [
"sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
"sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
],
"packages": [
"@Core",
@ -22,7 +22,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{
@ -62,15 +63,14 @@
"name": "org.osbuild.fix-bls"
}
],
"assembler":
{
"name": "org.osbuild.qemu",
"options": {
"format": "qcow2",
"filename": "base.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
}
"assembler": {
"name": "org.osbuild.qemu",
"options": {
"format": "qcow2",
"filename": "base.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
}
}
}

3
samples/base-rawfs.json
View file

@ -23,7 +23,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{

3
samples/base.json
View file

@ -12,7 +12,8 @@
"@Core",
"selinux-policy-targeted",
"grub2-pc"
]
],
"module_platform_id": "platform:f30"
}
}
]

3
samples/cloud-base.json
View file

@ -25,7 +25,8 @@
"firewalld",
"gobject-introspection",
"plymouth"
]
],
"module_platform_id": "platform:f30"
}
},
{

3
samples/f30-aarch64.json
View file

@ -27,7 +27,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{

3
samples/f30-base-uefi.json
View file

@ -29,7 +29,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{

10
samples/f30-bootpart-hybrid.json
View file

@ -29,7 +29,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{
@ -39,7 +40,8 @@
"cloud-config",
"cloud-final",
"cloud-init",
"cloud-init-local"]
"cloud-init-local"
]
}
},
{
@ -105,7 +107,9 @@
"assembler": {
"name": "org.osbuild.qemu",
"options": {
"bootloader": {"type": "grub2"},
"bootloader": {
"type": "grub2"
},
"format": "qcow2",
"filename": "base.qcow2",
"size": 3221225472,

49
samples/f30-ppc64le.json
View file

@ -28,7 +28,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{
@ -69,25 +70,33 @@
"name": "org.osbuild.fix-bls"
}
],
"assembler":
{
"name": "org.osbuild.qemu",
"options": {
"bootloader": {
"type": "grub2",
"platform": "powerpc-ieee1275"
"assembler": {
"name": "org.osbuild.qemu",
"options": {
"bootloader": {
"type": "grub2",
"platform": "powerpc-ieee1275"
},
"format": "qcow2",
"filename": "base.qcow2",
"size": 3221225472,
"ptuuid": "29579f67-d390-43e7-bd96-dc8f5461171e",
"pttype": "dos",
"partitions": [
{
"size": 8192,
"type": "41",
"bootable": true
},
"format": "qcow2",
"filename": "base.qcow2",
"size": 3221225472,
"ptuuid": "29579f67-d390-43e7-bd96-dc8f5461171e",
"pttype": "dos",
"partitions": [
{"size": 8192, "type": "41", "bootable": true},
{"start": 10240,
"filesystem": {"type": "ext4", "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"mountpoint": "/"}}
]
}
{
"start": 10240,
"filesystem": {
"type": "ext4",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"mountpoint": "/"
}
}
]
}
}
}

57
samples/f30-qcow2-gpt.json
View file

@ -7,7 +7,7 @@
"basearch": "x86_64",
"install_weak_deps": true,
"repos": [
"sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
"sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97"
],
"packages": [
"@Fedora Cloud Server",
@ -22,7 +22,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{
@ -32,7 +33,8 @@
"cloud-config",
"cloud-final",
"cloud-init",
"cloud-init-local"]
"cloud-init-local"
]
}
},
{
@ -72,29 +74,32 @@
"name": "org.osbuild.fix-bls"
}
],
"assembler":
{
"name": "org.osbuild.qemu",
"options": {
"bootloader": {"type": "grub2"},
"format": "qcow2",
"filename": "base.qcow2",
"ptuuid": "29579f67-d390-43e7-bd96-dc8f5461171e",
"pttype": "gpt",
"partitions": [
{
"size": 8192, "type": "21686148-6449-6E6F-744E-656564454649", "bootable": true
},
{
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"filesystem": {
"type": "ext4",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"mountpoint": "/"
}
"assembler": {
"name": "org.osbuild.qemu",
"options": {
"bootloader": {
"type": "grub2"
},
"format": "qcow2",
"filename": "base.qcow2",
"ptuuid": "29579f67-d390-43e7-bd96-dc8f5461171e",
"pttype": "gpt",
"partitions": [
{
"size": 8192,
"type": "21686148-6449-6E6F-744E-656564454649",
"bootable": true
},
{
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"filesystem": {
"type": "ext4",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"mountpoint": "/"
}
],
"size": 3221225472
}
}
],
"size": 3221225472
}
}
}

10
samples/f30-qcow2-hybrid.json
View file

@ -29,7 +29,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{
@ -39,7 +40,8 @@
"cloud-config",
"cloud-final",
"cloud-init",
"cloud-init-local"]
"cloud-init-local"
]
}
},
{
@ -94,7 +96,9 @@
"assembler": {
"name": "org.osbuild.qemu",
"options": {
"bootloader": {"type": "grub2"},
"bootloader": {
"type": "grub2"
},
"format": "qcow2",
"filename": "base.qcow2",
"size": 3221225472,

31
samples/f30-s390x.json
View file

@ -14,7 +14,7 @@
"basearch": "s390x",
"install_weak_deps": true,
"repos": [
"sha256:450d4c06339dc1c976df0c4069ca5778e1f4261de7d2f6c079bec2b5da795f7c"
"sha256:450d4c06339dc1c976df0c4069ca5778e1f4261de7d2f6c079bec2b5da795f7c"
],
"packages": [
"@Fedora Cloud Server",
@ -30,7 +30,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{
@ -40,7 +41,8 @@
"cloud-config",
"cloud-final",
"cloud-init",
"cloud-init-local"]
"cloud-init-local"
]
}
},
{
@ -76,16 +78,17 @@
"name": "org.osbuild.fix-bls"
}
],
"assembler":
{
"name": "org.osbuild.qemu",
"options": {
"bootloader": {"type": "zipl"},
"format": "qcow2",
"filename": "base.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
}
"assembler": {
"name": "org.osbuild.qemu",
"options": {
"bootloader": {
"type": "zipl"
},
"format": "qcow2",
"filename": "base.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
}
}
}

6
test/pipelines/f30-base.json
View file

@ -19,7 +19,8 @@
"qemu-img",
"systemd",
"tar"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -38,7 +39,8 @@
"packages": [
"@Core",
"selinux-policy-targeted"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/pipelines/f30-boot.json
View file

@ -18,7 +18,8 @@
"policycoreutils",
"qemu-img",
"systemd"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -48,7 +49,8 @@
],
"exclude_packages": [
"dracut-config-rescue"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/chrony/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -32,7 +33,8 @@
"packages": [
"@Core",
"chrony"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/chrony/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -32,7 +33,8 @@
"packages": [
"@Core",
"chrony"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/firewall/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/firewall/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/fstab/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/fstab/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/groups/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/groups/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/hostname/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/hostname/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

3
test/stages_tests/kernel-cmdline/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]

3
test/stages_tests/kernel-cmdline/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/keymap/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/keymap/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/locale/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/locale/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

3
test/stages_tests/rpm/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/systemd/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/systemd/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/timezone/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/timezone/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

6
test/stages_tests/users/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
}
]

6
test/stages_tests/users/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]
@ -31,7 +32,8 @@
],
"packages": [
"@Core"
]
],
"module_platform_id": "platform:f30"
}
},
{

3
test/stages_tests/zipl/a.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]

3
test/stages_tests/zipl/b.json
View file

@ -13,7 +13,8 @@
],
"packages": [
"dnf"
]
],
"module_platform_id": "platform:f30"
}
}
]