From patchwork Mon Jun 25 19:01:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 1838 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 82A156095C for ; Mon, 25 Jun 2018 11:01:57 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id 3705811490CC; Mon, 25 Jun 2018 10:01:57 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917317; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=JOClUh0FUBMXUGOr4XT45gzEdjmBQtx96i4a7dprj4M=; b=pnnvkyg0dtgWHfeRDgHtb9lDs2EmCEFKSvzymLr/zNunsd8jEuGygc6rdt2Uy6WPZAVHOE 9+feNiphNgv3CroVqA06IV/UlempibGx/v0FwNly+mf3YqaeUZiC6aovEaaJI9riRZsSLr 355WdlZdCFAYp7AuAkP+rz3q5DLCgVu9Yy8XJNsPQl9G2SKSfmtjCtP9r59WiGMn66Kl5B vN72r3ou3l9RhgJLoUUHNvT0ldgzFO3Jlup0nW+1ko/KOt/EL6pERTFLAEeXzIDF5wZNWx vbczCfmoKJC0iw3NfusYHpU37MFp/hqXU8VIy7tB0Kqxi9WrLWM1rDu3/HBEgQ== Received: from bockland.local.familyschlag (fw-1.cvjm.hk-net.de [95.129.212.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id E40541136E36; Mon, 25 Jun 2018 10:01:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917315; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=JOClUh0FUBMXUGOr4XT45gzEdjmBQtx96i4a7dprj4M=; b=PTLHr6jGup55uPcJKOE9rPWCIe1YHF+CS3Ap9RQZaVSnxwTkym3GHh4RRgyDzwx4sz5fK7 FlnLivenMNF3zGTA71GM1/nlrFOHo4sHK1UgJ4+EIAM6H8n54Y974I65ID4CrS3oSlQj/G tVFxCA1cczkgQ1qKAnFv0sxkigNh74SwI/47GOpIHlsIdvY3Gj0k+FaZSq/jYYY874DS/X HH0MNXN9cgw0gJ0x3WPIIE78+cGdAgyhO/8n2epsk7OZhszIUksUnNNj+YuSEnL5G4Jdir hFL0d2UMP1t461l2BBjigbwmb7CxloMXfXfcmV7WIhJ7jbuTIAGT7AX4Tjpp3w== From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 1/3] Adapt nitsi command line to new syntax Date: Mon, 25 Jun 2018 11:01:41 +0200 Message-Id: <20180625090143.31218-1-jonatan.schlag@ipfire.org> X-Mailer: git-send-email 2.11.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=jschlag smtp.mailfrom=jonatan.schlag@ipfire.org X-Spamd-Result: default: False [-2.10 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ASN(0.00)[asn:44700, ipnet:95.129.208.0/21, country:DE]; FROM_HAS_DN(0.00)[] X-Spam-Status: No, score=-2.10 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: network@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List for the network package List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: network-bounces@lists.ipfire.org Sender: "network" Nitsi is now using subparsers so we have to add 'run-test' to the command line. Signed-off-by: Jonatan Schlag --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8139399..f11c721 100644 --- a/Makefile.am +++ b/Makefile.am @@ -601,7 +601,7 @@ NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) $(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) - $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ + $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ .PHONY: nitsi nitsi: dist $(NITSI_TESTS) From patchwork Mon Jun 25 19:01:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 1839 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id E0DDD60AC9 for ; Mon, 25 Jun 2018 11:01:58 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id B662A115A623; Mon, 25 Jun 2018 10:01:58 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917318; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=yBwQLTopsmI+l3Tb7MeLe/vTkVLR4LQkOsgveQZSwe8=; b=a4QBlY6cDqHJbbmtgrjsCijdpCYnJxpkXyJ0Vm6N+mDQXvH1LSfFKzXN3dP0NfCiyQ+OZV 76x1lupCXBXix63XfkbnSRi9fP8yr8azp+iKcXZulQbTfBQDdCh1l9eMXGIruoTLSP0+XS MzTSWcg7ALKenvrrSuyca84M96mkJwcPRq3j/M+BcaftAoXP93ljyumKwatc32oqpV7bWR rUp9k+egqZMjrQXOidU7qUpaWzoMk05NGRnM9Kp1iyRz2IwVwNpbUTdNfj4gNfm7ME0a0r ntMrvKHg6SM3H4kDO5EoxFb+FY6tLQA2jL3voGll+cvRW9JmEM8ohP4zcNnpuA== Received: from bockland.local.familyschlag (fw-1.cvjm.hk-net.de [95.129.212.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 71F9811490CC; Mon, 25 Jun 2018 10:01:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917316; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=yBwQLTopsmI+l3Tb7MeLe/vTkVLR4LQkOsgveQZSwe8=; b=IThuSMFzrM35Vg7+piU/UwmDLZsZ4MFEJbU54gcRi2yfZjYWvOSLoALvCcbNXKB5oWrdSo 65utvLPtg+dQ1q61RRjYABFeFuYd+WFl/M97rqj+2/B/WewE4eqNQ9nNZQJ/HBlERaFUcN VgjqhthspnYQCw1JLA7JqbL1GA+YG2xLqjzuKvhGkT/9sH0enw7OEnsJHgVCpmXwO9BZL8 ++BoROBX+kZ92CBl8sUqVk8QQVtgGjVWsoIV2Cx/bhWYEQp32Ch5huYeFW/6gto9+WaGCC qj7qCYuxDnm6K7Nk5eLLSrylZEynAxRmgvAh6ShMZXLm8kisGck/WVjFS59fUQ== From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 2/3] Adapt settings file of nitsi tests to new syntax Date: Mon, 25 Jun 2018 11:01:42 +0200 Message-Id: <20180625090143.31218-2-jonatan.schlag@ipfire.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org> References: <20180625090143.31218-1-jonatan.schlag@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=jschlag smtp.mailfrom=jonatan.schlag@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DKIM_SIGNED(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:44700, ipnet:95.129.208.0/21, country:DE] X-Spam-Status: No, score=-6.10 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: network@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List for the network package List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: network-bounces@lists.ipfire.org Sender: "network" Nitsi is using a new syntax for settings file so we need to change the settings files of our tests. I dropped some settings in the hello-world test because we do not need them for this test. Signed-off-by: Jonatan Schlag --- test/nitsi/test/hello-world/settings | 10 +++------- test/nitsi/test/make-check/settings.in | 11 +++++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/test/nitsi/test/hello-world/settings b/test/nitsi/test/hello-world/settings index ee066ce..ab79a30 100644 --- a/test/nitsi/test/hello-world/settings +++ b/test/nitsi/test/hello-world/settings @@ -1,11 +1,7 @@ -[DEFAULT] -Name = Hello World -Description = This is a test to just check if nitsi is working. - -Copy_from = -Copy_to = /root/ +[GENERAL] +name = Hello World +description = This is a test to just check if nitsi is working. [VIRTUAL_ENVIRONMENT] -Name = basic path = ../../virtual-environment/basic diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-check/settings.in index cac865d..78d6fe0 100644 --- a/test/nitsi/test/make-check/settings.in +++ b/test/nitsi/test/make-check/settings.in @@ -1,12 +1,11 @@ -[DEFAULT] -Name = make check -Description = This test runs make install in the virtual environment +[GENERAL] +name = make check +description = This test runs make install in the virtual environment to determine if the source tarball is complete and module test can be executed in the virtual environment -Copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz -Copy_to = /root/ +copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz +copy_to = /root/ [VIRTUAL_ENVIRONMENT] -Name = basic path = ../../virtual-environment/basic From patchwork Mon Jun 25 19:01:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 1840 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 4A2E46095C for ; Mon, 25 Jun 2018 11:02:01 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id 1C2A911490CC; Mon, 25 Jun 2018 10:02:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917321; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=3WH37oPk5SFvpMHaTakwPBQGx38I7WVdE4H1OTgMgAQ=; b=LZ42U4ZIzMd0CJ6q5EWayhxffesFaZ6BRevqwGCLbxw3fsWRnoujXtUbL3RGYlpKdtPdNX JoqU/WR70lt6AhB2VX8iqrmDyemp1izM1w+63loAQICZeWvOoLVU6dc3nXZV5/o1M/ct7E jofdsDQvwkdyLWX25UQwX9P9p0dddlQC8rvFNQrDa8o1xr9S/rFudcH9mt/3sobRWDApWH cHJsysz6Li+YEGj554EXIom0P/alzTQW38bygrKYgO3ed7X6YAGcOR+DfIs79EsYZDMNLr 84KyLo79twMJkiP8B0JuNRYF49i4TT/NDMTaOxkPlo3VWxW8geUBlHqAR57yzQ== Received: from bockland.local.familyschlag (fw-1.cvjm.hk-net.de [95.129.212.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 83972115A622; Mon, 25 Jun 2018 10:01:57 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1529917317; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=3WH37oPk5SFvpMHaTakwPBQGx38I7WVdE4H1OTgMgAQ=; b=o+iCr7nyVFxjWOU6xY9M1KgI2ZelQzeomDl8Ax1c/RQ7nwl5cnp7GebT+McVwIbB+LHXnn /uu6/atZBhoi1yowhNwpG5GDf2ddDO9aA0UZ5fhS67pDjrTMjksLZOo2JfiIfX7OL+Zylj M81hoSwoWszmuNoqP4PIbic33lC1tMgavf/GJg9+oekDGr6EZkErERcQt+XasuaOmlx108 rsC3vPzJiiYeoITdXOwVv2UgNe0KxfpHjWZKo3jX05QaSELQyAjHOhsMjjtBVmXy0HsHsX A+AlZkER7jjzei/erftFpO3R1UdD9RNVtMq1QsEnR54EBJ52CUh4RYREaiOLqA== From: Jonatan Schlag 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 Message-Id: <20180625090143.31218-3-jonatan.schlag@ipfire.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180625090143.31218-1-jonatan.schlag@ipfire.org> References: <20180625090143.31218-1-jonatan.schlag@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=jschlag smtp.mailfrom=jonatan.schlag@ipfire.org X-Spamd-Result: default: False [-6.10 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DKIM_SIGNED(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:44700, ipnet:95.129.208.0/21, country:DE] X-Spam-Status: No, score=-6.10 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: network@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List for the network package List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: network-bounces@lists.ipfire.org Sender: "network" 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 --- 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