When we do not change this path accordingly to the place where we store our images the copy in feature does not work.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- Makefile.am | 6 ++++-- test/nitsi/virtual-environment/basic/.gitignore | 1 + test/nitsi/virtual-environment/basic/{settings => settings.in} | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 test/nitsi/virtual-environment/basic/.gitignore rename test/nitsi/virtual-environment/basic/{settings => settings.in} (84%)
diff --git a/Makefile.am b/Makefile.am index f11c721..b976da6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -563,13 +563,15 @@ EXTRA_DIST += \ test/nitsi/virtual-environment/basic/machines/alice/machine.xml.in \ test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml.in \ test/nitsi/virtual-environment/basic/machines/bob/machine.xml.in \ - test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in + test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in \ + test/nitsi/virtual-environment/basic/settings.in
CLEANFILES += \ test/nitsi/virtual-environment/basic/machines/alice/machine.xml \ test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml \ test/nitsi/virtual-environment/basic/machines/bob/machine.xml \ - test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml + test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml \ + test/nitsi/virtual-environment/basic/settings
# Virtual Machine Images VIRTUAL_ENVIRONMENT_IMAGES = \ diff --git a/test/nitsi/virtual-environment/basic/.gitignore b/test/nitsi/virtual-environment/basic/.gitignore new file mode 100644 index 0000000..308ef0b --- /dev/null +++ b/test/nitsi/virtual-environment/basic/.gitignore @@ -0,0 +1 @@ +/settings diff --git a/test/nitsi/virtual-environment/basic/settings b/test/nitsi/virtual-environment/basic/settings.in similarity index 84% rename from test/nitsi/virtual-environment/basic/settings rename to test/nitsi/virtual-environment/basic/settings.in index 44805ae..94d2090 100644 --- a/test/nitsi/virtual-environment/basic/settings +++ b/test/nitsi/virtual-environment/basic/settings.in @@ -7,7 +7,7 @@ uri = qemu:///system [alice] xml_file = machines/alice/machine.xml snapshot_xml_file = machines/alice/snapshot.xml -image = /var/lib/libvirt/images/ipfire-alice.qcow2 +image = @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-alice-2.qcow2 root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d username = root password = root @@ -15,7 +15,7 @@ password = root [bob] xml_file = machines/bob/machine.xml snapshot_xml_file = machines/bob/snapshot.xml -image = /var/lib/libvirt/images/ipfire-bob.qcow2 +image = @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-bob.qcow2 root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d username = root password = root