kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 18:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

5ffbdc4 made no sense, apt_proxy was already a build setting

Browse source
This commit is contained in:
Anders Ingemann 2014-12-21 19:42:43 +01:00
parent 943aab111f
commit 81060b2439
3 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bootstrapvz/remote/build-servers-schema.yml
View file

@ -31,6 +31,13 @@ definitions:
type: object
properties:
guest_additions: {$ref: '#/definitions/absolute_path'}
apt_proxy:
type: object
properties:
address: {type: string}
port: {type: integer}
persistent: {type: boolean}
required: [address, port]
ssh:
type: object

5
tests/integration/manifests/apt_proxy.yml
View file

@ -1,5 +0,0 @@
---
plugins:
apt_proxy:
address: 127.0.0.1
port: 3142

27
tests/integration/virtualbox_tests.py
View file

@ -9,8 +9,7 @@ partials = {'vbox': 'provider: {name: virtualbox}',
def test_unpartitioned_extlinux_oldstable():
std_partials = ['base', 'oldstable64', 'extlinux', 'unpartitioned',
'root_password', 'apt_proxy']
std_partials = ['base', 'oldstable64', 'extlinux', 'unpartitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -18,8 +17,7 @@ def test_unpartitioned_extlinux_oldstable():
def test_partitioned_extlinux_oldstable():
std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'single_partition',
'root_password', 'apt_proxy']
std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'single_partition', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -27,8 +25,7 @@ def test_partitioned_extlinux_oldstable():
def test_partitioned_grub_oldstable():
std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition',
'root_password', 'apt_proxy']
std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -36,8 +33,7 @@ def test_partitioned_grub_oldstable():
def test_unpartitioned_extlinux():
std_partials = ['base', 'stable64', 'extlinux', 'unpartitioned',
'root_password', 'apt_proxy']
std_partials = ['base', 'stable64', 'extlinux', 'unpartitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -45,8 +41,7 @@ def test_unpartitioned_extlinux():
def test_partitioned_extlinux():
std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'single_partition',
'root_password', 'apt_proxy']
std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'single_partition', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -54,8 +49,7 @@ def test_partitioned_extlinux():
def test_partitioned_grub():
std_partials = ['base', 'stable64', 'grub', 'msdos', 'single_partition',
'root_password', 'apt_proxy']
std_partials = ['base', 'stable64', 'grub', 'msdos', 'single_partition', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -64,8 +58,7 @@ def test_partitioned_grub():
def test_unpartitioned_extlinux_unstable():
raise Skip('Jessie not yet working with extlinux')
std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'unpartitioned',
'root_password', 'apt_proxy']
std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'unpartitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -74,8 +67,7 @@ def test_unpartitioned_extlinux_unstable():
def test_partitioned_extlinux_unstable():
raise Skip('Jessie not yet working with extlinux')
std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'single_partition',
'root_password', 'apt_proxy']
std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'single_partition', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance:
@ -83,8 +75,7 @@ def test_partitioned_extlinux_unstable():
def test_partitioned_grub_unstable():
std_partials = ['base', 'unstable64', 'grub', 'msdos', 'single_partition',
'root_password', 'apt_proxy']
std_partials = ['base', 'unstable64', 'grub', 'msdos', 'single_partition', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: