From 81060b2439d920a3c746585f8bf1466be8af46c7 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 21 Dec 2014 19:42:43 +0100 Subject: [PATCH] 5ffbdc4 made no sense, apt_proxy was already a build setting --- bootstrapvz/remote/build-servers-schema.yml | 7 ++++++ tests/integration/manifests/apt_proxy.yml | 5 ---- tests/integration/virtualbox_tests.py | 27 +++++++-------------- 3 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 tests/integration/manifests/apt_proxy.yml diff --git a/bootstrapvz/remote/build-servers-schema.yml b/bootstrapvz/remote/build-servers-schema.yml index 3990704..ceba3eb 100644 --- a/bootstrapvz/remote/build-servers-schema.yml +++ b/bootstrapvz/remote/build-servers-schema.yml @@ -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 diff --git a/tests/integration/manifests/apt_proxy.yml b/tests/integration/manifests/apt_proxy.yml deleted file mode 100644 index 36e0026..0000000 --- a/tests/integration/manifests/apt_proxy.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -plugins: - apt_proxy: - address: 127.0.0.1 - port: 3142 diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py index 0d5c20a..26fa4c3 100644 --- a/tests/integration/virtualbox_tests.py +++ b/tests/integration/virtualbox_tests.py @@ -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: