From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH 3/3] We need to change the path of the image in the settings file to
Date: Mon, 25 Jun 2018 11:01:43 +0200 [thread overview]
Message-ID: <20180625090143.31218-3-jonatan.schlag@ipfire.org> (raw)
In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2966 bytes --]
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(a)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
--
2.11.0
prev parent reply other threads:[~2018-06-25 9:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 9:01 [PATCH 1/3] Adapt nitsi command line to new syntax Jonatan Schlag
2018-06-25 9:01 ` [PATCH 2/3] Adapt settings file of nitsi tests " Jonatan Schlag
2018-06-25 9:01 ` Jonatan Schlag [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180625090143.31218-3-jonatan.schlag@ipfire.org \
--to=jonatan.schlag@ipfire.org \
--cc=network@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox