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

test/cases: fix expected values for the image info sub-test

Browse source 
osbuild removed GRUB2_ROOT_FS_UUID from grubenv in 22d131a5. This broke
the Jenkins CI because it runs against osbuild master.

This commit fixes all the testcases and bumps the osbuild submodule
to version 13 that changed the GRUB2_ROOT_FS_UUID behaviour.
This commit is contained in:
Ondřej Budai 2020-04-30 13:58:16 +02:00
parent 50df564caf
commit 7f7769cae0
34 changed files with 26 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/cases/fedora_30-aarch64-ami-boot.json
View file

@ -7233,7 +7233,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
},
"bootloader": "unknown",

3
test/cases/fedora_30-aarch64-openstack-boot.json
View file

@ -7479,7 +7479,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "unknown",
@ -8097,4 +8096,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/fedora_30-aarch64-partitioned_disk-boot.json
View file

@ -6794,7 +6794,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "unknown",
@ -7351,4 +7350,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/fedora_30-aarch64-qcow2-boot.json
View file

@ -7106,7 +7106,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "unknown",
@ -7686,4 +7685,4 @@
],
"timezone": "UTC"
}
}
}

1
test/cases/fedora_30-x86_64-ami-boot.json
View file

@ -7193,7 +7193,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
},
"bootloader": "grub",

3
test/cases/fedora_30-x86_64-openstack-boot.json
View file

@ -7427,7 +7427,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -8018,4 +8017,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/fedora_30-x86_64-partitioned_disk-boot.json
View file

@ -6754,7 +6754,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -7285,4 +7284,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/fedora_30-x86_64-qcow2-boot.json
View file

@ -7131,7 +7131,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -7690,4 +7689,4 @@
],
"timezone": "UTC"
}
}
}

1
test/cases/fedora_30-x86_64-vhd-boot.json
View file

@ -6883,7 +6883,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
},
"bootloader": "grub",

3
test/cases/fedora_30-x86_64-vmdk-boot.json
View file

@ -6961,7 +6961,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -7511,4 +7510,4 @@
],
"timezone": "UTC"
}
}
}

1
test/cases/fedora_31-aarch64-ami-boot.json
View file

@ -8513,7 +8513,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
},
"bootloader": "unknown",

3
test/cases/fedora_31-aarch64-openstack-boot.json
View file

@ -8646,7 +8646,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "unknown",
@ -9310,4 +9309,4 @@
"unbound-anchor.timer"
]
}
}
}

3
test/cases/fedora_31-aarch64-partitioned_disk-boot.json
View file

@ -8087,7 +8087,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "unknown",
@ -8702,4 +8701,4 @@
"unbound-anchor.timer"
]
}
}
}

3
test/cases/fedora_31-aarch64-qcow2-boot.json
View file

@ -8438,7 +8438,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "unknown",
@ -9081,4 +9080,4 @@
"unbound-anchor.timer"
]
}
}
}

1
test/cases/fedora_31-x86_64-ami-boot.json
View file

@ -8762,7 +8762,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
},
"bootloader": "grub",

3
test/cases/fedora_31-x86_64-openstack-boot.json
View file

@ -8895,7 +8895,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -9533,4 +9532,4 @@
"unbound-anchor.timer"
]
}
}
}

3
test/cases/fedora_31-x86_64-partitioned_disk-boot.json
View file

@ -8349,7 +8349,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -8939,4 +8938,4 @@
"unbound-anchor.timer"
]
}
}
}

3
test/cases/fedora_31-x86_64-qcow2-boot.json
View file

@ -8765,7 +8765,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -9388,4 +9387,4 @@
"unbound-anchor.timer"
]
}
}
}

1
test/cases/fedora_31-x86_64-vhd-boot.json
View file

@ -8452,7 +8452,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
},
"bootloader": "grub",

3
test/cases/fedora_31-x86_64-vmdk-boot.json
View file

@ -8556,7 +8556,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -9165,4 +9164,4 @@
"vmtoolsd.service"
]
}
}
}

3
test/cases/fedora_32-x86_64-ami-boot.json
View file

@ -7254,7 +7254,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
},
"bootloader": "grub",
@ -7823,4 +7822,4 @@
"unbound-anchor.timer"
]
}
}
}

3
test/cases/fedora_32-x86_64-openstack-boot.json
View file

@ -7517,7 +7517,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -8108,4 +8107,4 @@
"unbound-anchor.timer"
]
}
}
}

3
test/cases/fedora_32-x86_64-partitioned_disk-boot.json
View file

@ -6854,7 +6854,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -7388,4 +7387,4 @@
"unbound-anchor.timer"
]
}
}
}

3
test/cases/fedora_32-x86_64-qcow2-boot.json
View file

@ -7218,7 +7218,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -7783,4 +7782,4 @@
"unbound-anchor.timer"
]
}
}
}

1
test/cases/fedora_32-x86_64-vhd-boot.json
View file

@ -6957,7 +6957,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
},
"bootloader": "grub",

3
test/cases/fedora_32-x86_64-vmdk-boot.json
View file

@ -7035,7 +7035,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
},
"bootloader": "grub",
@ -7586,4 +7585,4 @@
"vmtoolsd.service"
]
}
}
}

3
test/cases/rhel_8.2-x86_64-ami-boot.json
View file

@ -7830,7 +7830,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernelopts": "root=UUID=0bd700f8-090f-4556-b797-b340297ea1bd ro console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto"
},
"bootloader": "grub",
@ -8448,4 +8447,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/rhel_8.2-x86_64-ext4_filesystem-boot.json
View file

@ -5303,7 +5303,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernelopts": "root=UUID=0bd700f8-090f-4556-b797-b340297ea1bd ro net.ifnames=0"
},
"bootloader": "unknown",
@ -5673,4 +5672,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/rhel_8.2-x86_64-openstack-boot.json
View file

@ -8362,7 +8362,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernelopts": "root=UUID=0bd700f8-090f-4556-b797-b340297ea1bd ro net.ifnames=0"
},
"bootloader": "grub",
@ -9029,4 +9028,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/rhel_8.2-x86_64-partitioned_disk-boot.json
View file

@ -7894,7 +7894,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernelopts": "root=UUID=0bd700f8-090f-4556-b797-b340297ea1bd ro net.ifnames=0"
},
"bootloader": "grub",
@ -8524,4 +8523,4 @@
],
"timezone": "UTC"
}
}
}

3
test/cases/rhel_8.2-x86_64-qcow2-boot.json
View file

@ -8425,7 +8425,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernelopts": "root=UUID=0bd700f8-090f-4556-b797-b340297ea1bd console=ttyS0 console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0"
},
"bootloader": "grub",
@ -9110,4 +9109,4 @@
],
"timezone": "UTC"
}
}
}

1
test/cases/rhel_8.2-x86_64-vhd-boot.json
View file

@ -8291,7 +8291,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernelopts": "root=UUID=0bd700f8-090f-4556-b797-b340297ea1bd ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
},
"bootloader": "grub",

3
test/cases/rhel_8.2-x86_64-vmdk-boot.json
View file

@ -8049,7 +8049,6 @@
},
"image-info": {
"boot-environment": {
"GRUB2_ROOT_FS_UUID": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernelopts": "root=UUID=0bd700f8-090f-4556-b797-b340297ea1bd ro net.ifnames=0"
},
"bootloader": "grub",
@ -8693,4 +8692,4 @@
],
"timezone": "UTC"
}
}
}