It saves us much time when we install the network only on alice, when we are using alice only.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- Makefile.am | 9 ++++++--- test/nitsi/include/alice_make-install.in | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 test/nitsi/include/alice_make-install.in
diff --git a/Makefile.am b/Makefile.am index e56d0fb..bde49ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -586,13 +586,16 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/
NITSI_INCLUDE_RECIPES = \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/alice_make-install
EXTRA_DIST += \ - test/nitsi/include/make-install.in + test/nitsi/include/make-install.in \ + test/nitsi/include/alice_make-install.in
CLEANFILES += \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/alice_make-install
NITSI_TESTS = \ test/nitsi/test/hello-world \ diff --git a/test/nitsi/include/alice_make-install.in b/test/nitsi/include/alice_make-install.in new file mode 100644 index 0000000..6718510 --- /dev/null +++ b/test/nitsi/include/alice_make-install.in @@ -0,0 +1,4 @@ +alice: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACKAGE_VERSION@ +alice: ./configure --prefix=/usr && make -j2 +alice: make +alice: make install
We using --force here to avoid the interactive y/n question.
This recipe is available in two version one for a setup with multiple machines and one for a setup with alice only.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- Makefile.am | 8 ++++++-- test/nitsi/include/alice_network-reset | 1 + test/nitsi/include/network-reset | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 test/nitsi/include/alice_network-reset create mode 100644 test/nitsi/include/network-reset
diff --git a/Makefile.am b/Makefile.am index bde49ff..66d2e8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -587,11 +587,15 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
NITSI_INCLUDE_RECIPES = \ test/nitsi/include/make-install \ - test/nitsi/include/alice_make-install + test/nitsi/include/alice_make-install \ + test/nitsi/include/alice_network-reset \ + test/nitsi/include/network-reset
EXTRA_DIST += \ test/nitsi/include/make-install.in \ - test/nitsi/include/alice_make-install.in + test/nitsi/include/alice_make-install.in \ + test/nitsi/include/alice_network-reset \ + test/nitsi/include/network-reset
CLEANFILES += \ test/nitsi/include/make-install \ diff --git a/test/nitsi/include/alice_network-reset b/test/nitsi/include/alice_network-reset new file mode 100644 index 0000000..cfb3bd5 --- /dev/null +++ b/test/nitsi/include/alice_network-reset @@ -0,0 +1 @@ +alice: network reset --force diff --git a/test/nitsi/include/network-reset b/test/nitsi/include/network-reset new file mode 100644 index 0000000..d82e2b1 --- /dev/null +++ b/test/nitsi/include/network-reset @@ -0,0 +1 @@ +all: network reset --force
Some settings are equal for each test, so it is easier to write them down once and include them then in every test.
We have two version here (all and alice) to avoid that bob is booted when we are using only alice. (The all statement is substituded to alice: and bob: so we have a command for bob and the machine is booted, which costs time.)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- Makefile.am | 8 ++++++-- test/nitsi/include/alice_network-settings | 1 + test/nitsi/include/network-settings | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 test/nitsi/include/alice_network-settings create mode 100644 test/nitsi/include/network-settings
diff --git a/Makefile.am b/Makefile.am index 66d2e8d..1f75ef3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -589,13 +589,17 @@ NITSI_INCLUDE_RECIPES = \ test/nitsi/include/make-install \ test/nitsi/include/alice_make-install \ test/nitsi/include/alice_network-reset \ - test/nitsi/include/network-reset + test/nitsi/include/network-reset \ + test/nitsi/include/alice_network-settings \ + test/nitsi/include/network-settings
EXTRA_DIST += \ test/nitsi/include/make-install.in \ test/nitsi/include/alice_make-install.in \ test/nitsi/include/alice_network-reset \ - test/nitsi/include/network-reset + test/nitsi/include/network-reset \ + test/nitsi/include/alice_network-settings \ + test/nitsi/include/network-settings
CLEANFILES += \ test/nitsi/include/make-install \ diff --git a/test/nitsi/include/alice_network-settings b/test/nitsi/include/alice_network-settings new file mode 100644 index 0000000..1c071de --- /dev/null +++ b/test/nitsi/include/alice_network-settings @@ -0,0 +1 @@ +alice: network settings DEBUG=1 diff --git a/test/nitsi/include/network-settings b/test/nitsi/include/network-settings new file mode 100644 index 0000000..535fe4c --- /dev/null +++ b/test/nitsi/include/network-settings @@ -0,0 +1 @@ +all: network settings DEBUG=1
-
Jonatan Schlag