Use debootstrap+default as os. SSH setup must not be modified in vcluster qa. Disable two tests that do not pass in vcluster qa.
Signed-off-by: Bhimanavajjula Aditya <[email protected]> --- .../files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json b/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json index 7fe1bb2..ace9201 100644 --- a/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json +++ b/roles/buildmaster/files/srv/buildbot/masters/ganeti/qa-vcluster-tiny.json @@ -13,7 +13,7 @@ "hypervisor-parameters": {}, "primary_ip_version": 4, - "os": "busybox", + "os": "debootstrap+default", "mem": "1G", "maxmem": "1G", "minmem": "512M", @@ -27,6 +27,8 @@ "ispec_disk_size_min": 0, "ispec_disk_count_min": 0, + "modify_ssh_setup": false, + "master-netdev": "lo", "default-nicparams": { "mode": "bridged", "link": "br0" }, @@ -70,6 +72,8 @@ "default": true, "default-instance-tests": true, + "performance": false, + "# NOTE: The tests below are disabled because they do not work": null, "# properly in virtual clusters. Some could be made to work with": null, "# a bit of work on the QA code.": null, @@ -83,6 +87,7 @@ "htools": false, "instance-add-drbd-disk": false, "instance-add-plain-disk": false, + "instance-device-hotplug": false, "instance-export": false, "instance-import": false, "instance-modify": false, -- 2.6.0.rc2.230.g3dd15c0
