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

change image size to fulfill Azure requirements

Browse source 
the hardcoded image size is now aligned to 1MB, because Azure requires
it: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/create-upload-generic

once we make the size configurable, we should make sure the alignment
stays the same

fix test cases to reflect new image size
This commit is contained in:
Martin Sehnoutka 2019-11-21 13:30:53 +01:00 • committed by Tom Gundersen
parent ea73597c5d
commit 4910cd18e3
15 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/distro/fedora30/helpers.go
View file

@ -181,7 +181,9 @@ func addF30QemuAssembler(p *pipeline.Pipeline, format string, filename string) {
Filename: filename,
PTUUID: "0x14fc63d2",
RootFilesystemUUDI: id,
Size: 3221225472,
// Azure requires this size to be a multiple of 1MB. If you change this, make sure
// the size still fulfills this requirement to prevent regressions.
Size: 3222274048,
})
}
@ -201,6 +203,6 @@ func addF30RawFSAssembler(p *pipeline.Pipeline, filename string) {
&pipeline.RawFSAssemblerOptions{
Filename: filename,
RootFilesystemUUDI: id,
Size: 3221225472,
Size: 3222274048,
})
}

4
test/cases/ami_empty_blueprint.json
View file

@ -111,7 +111,7 @@
"filename": "image.ami",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
},
@ -557,7 +557,7 @@
"fstype": "ext4",
"label": null,
"partuuid": "14fc63d2-01",
"size": 3220176896,
"size": 3221225472,
"start": 1048576,
"type": "83",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"

2
test/cases/ami_local_boot.json
View file

@ -165,7 +165,7 @@
"filename": "image.ami",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
}

4
test/cases/disk_empty_blueprint.json
View file

@ -107,7 +107,7 @@
"filename": "disk.img",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
},
@ -518,7 +518,7 @@
"fstype": "ext4",
"label": null,
"partuuid": "14fc63d2-01",
"size": 3220176896,
"size": 3221225472,
"start": 1048576,
"type": "83",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"

2
test/cases/disk_local_boot.json
View file

@ -166,7 +166,7 @@
"filename": "disk.img",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
}

2
test/cases/ext4_empty_blueprint.json
View file

@ -89,7 +89,7 @@
"options": {
"filename": "filesystem.img",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
},

2
test/cases/ext4_local_boot.json
View file

@ -149,7 +149,7 @@
"options": {
"filename": "filesystem.img",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
}

4
test/cases/openstack_empty_blueprint.json
View file

@ -111,7 +111,7 @@
"filename": "image.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
},
@ -574,7 +574,7 @@
"fstype": "ext4",
"label": null,
"partuuid": "14fc63d2-01",
"size": 3220176896,
"size": 3221225472,
"start": 1048576,
"type": "83",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"

2
test/cases/openstack_local_boot.json
View file

@ -161,7 +161,7 @@
"filename": "image.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
}

4
test/cases/qcow2_empty_blueprint.json
View file

@ -112,7 +112,7 @@
"filename": "image.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
},
@ -555,7 +555,7 @@
"fstype": "ext4",
"label": null,
"partuuid": "14fc63d2-01",
"size": 3220176896,
"size": 3221225472,
"start": 1048576,
"type": "83",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"

2
test/cases/qcow2_local_boot.json
View file

@ -162,7 +162,7 @@
"filename": "image.qcow2",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
}

6
test/cases/vhd_empty_blueprint.json
View file

@ -106,11 +106,11 @@
"assembler": {
"name": "org.osbuild.qemu",
"options": {
"format": "qcow2",
"format": "vpc",
"filename": "image.vhd",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
},
@ -528,7 +528,7 @@
"fstype": "ext4",
"label": null,
"partuuid": "14fc63d2-01",
"size": 3220176896,
"size": 3221225472,
"start": 1048576,
"type": "83",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"

2
test/cases/vhd_local_boot.json
View file

@ -160,7 +160,7 @@
"filename": "image.vhd",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
}

4
test/cases/vmdk_empty_blueprint.json
View file

@ -108,7 +108,7 @@
"filename": "disk.vmdk",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
},
@ -535,7 +535,7 @@
"fstype": "ext4",
"label": null,
"partuuid": "14fc63d2-01",
"size": 3220176896,
"size": 3221225472,
"start": 1048576,
"type": "83",
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac"

2
test/cases/vmdk_local_boot.json
View file

@ -158,7 +158,7 @@
"filename": "disk.vmdk",
"ptuuid": "0x14fc63d2",
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"size": 3221225472
"size": 3222274048
}
}
}