kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-10-07 17:40:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to using 3 partitions when testing gpt+msdos

Browse source 
Make boot partition a little bigger
This commit is contained in:
Anders Ingemann 2015-01-20 08:31:12 +01:00
parent 4cbc8e4f8e
commit b70e24a848
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/manifests/partitioned.yml
View file

@ -3,9 +3,9 @@ volume:
partitions: partitions:
boot: boot:
filesystem: ext2 filesystem: ext2
size: 32MiB size: 64MiB
root: root:
filesystem: ext4 filesystem: ext4
size: 864MiB size: 832MiB
swap: swap:
size: 128MiB size: 128MiB

24
tests/integration/virtualbox_tests.py
View file

@ -17,7 +17,7 @@ def test_unpartitioned_extlinux_oldstable():
def test_msdos_extlinux_oldstable(): def test_msdos_extlinux_oldstable():
std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -25,7 +25,7 @@ def test_msdos_extlinux_oldstable():
def test_gpt_extlinux_oldstable(): def test_gpt_extlinux_oldstable():
std_partials = ['base', 'oldstable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] std_partials = ['base', 'oldstable64', 'extlinux', 'gpt', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -34,7 +34,7 @@ def test_gpt_extlinux_oldstable():
def test_msdos_grub_oldstable(): def test_msdos_grub_oldstable():
raise SkipTest('grub install on squeeze is broken') raise SkipTest('grub install on squeeze is broken')
std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition', 'root_password'] std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -43,7 +43,7 @@ def test_msdos_grub_oldstable():
def test_gpt_grub_oldstable(): def test_gpt_grub_oldstable():
raise SkipTest('grub install on squeeze is broken') raise SkipTest('grub install on squeeze is broken')
std_partials = ['base', 'oldstable64', 'grub', 'gpt', 'single_partition', 'root_password'] std_partials = ['base', 'oldstable64', 'grub', 'gpt', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -59,7 +59,7 @@ def test_unpartitioned_extlinux():
def test_msdos_extlinux(): def test_msdos_extlinux():
std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -67,7 +67,7 @@ def test_msdos_extlinux():
def test_gpt_extlinux(): def test_gpt_extlinux():
std_partials = ['base', 'stable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] std_partials = ['base', 'stable64', 'extlinux', 'gpt', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -75,7 +75,7 @@ def test_gpt_extlinux():
def test_msdos_grub(): def test_msdos_grub():
std_partials = ['base', 'stable64', 'grub', 'msdos', 'single_partition', 'root_password'] std_partials = ['base', 'stable64', 'grub', 'msdos', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -83,7 +83,7 @@ def test_msdos_grub():
def test_gpt_grub(): def test_gpt_grub():
std_partials = ['base', 'stable64', 'grub', 'gpt', 'single_partition', 'root_password'] std_partials = ['base', 'stable64', 'grub', 'gpt', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -99,7 +99,7 @@ def test_unpartitioned_extlinux_unstable():
def test_msdos_extlinux_unstable(): def test_msdos_extlinux_unstable():
std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -107,7 +107,7 @@ def test_msdos_extlinux_unstable():
def test_gpt_extlinux_unstable(): def test_gpt_extlinux_unstable():
std_partials = ['base', 'unstable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] std_partials = ['base', 'unstable64', 'extlinux', 'gpt', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -115,7 +115,7 @@ def test_gpt_extlinux_unstable():
def test_msdos_grub_unstable(): def test_msdos_grub_unstable():
std_partials = ['base', 'unstable64', 'grub', 'msdos', 'single_partition', 'root_password'] std_partials = ['base', 'unstable64', 'grub', 'msdos', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance:
@ -123,7 +123,7 @@ def test_msdos_grub_unstable():
def test_gpt_grub_unstable(): def test_gpt_grub_unstable():
std_partials = ['base', 'unstable64', 'grub', 'gpt', 'single_partition', 'root_password'] std_partials = ['base', 'unstable64', 'grub', 'gpt', 'partitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance: