From patchwork Tue Jun 5 01:38:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1795 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 9E48560B60 for ; Mon, 4 Jun 2018 17:38:40 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 4406E10F8B83; Mon, 4 Jun 2018 16:38:40 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126720; h=from:from:sender: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:list-id: list-unsubscribe:list-subscribe:list-post; bh=Byt4HGbil0rVvNDsL3I2GGtAERtLtI/3At12EpajhbY=; b=Ql0RIHm7CDYBVxu5tZr8/0G+cMUcb8iEq7pKThk4rGIbVPTjgP9EYxYaGRaVyOs2H6+r3P TV+RSn8G/JmQ+7BfClIGnUzL2kIzD0/O823OhoMUIsYSrjfS5ApyKqjkECbGkUfQqnB/+2 HY3guln69OLKhGR7tqoXWTWvtm6YyM+ToGjDJYrNUUxi7C5au0OIw8ooUaZl0/IlQdqE5B E2qQ9XgAsGeN+BHpWWQO+NvXDmskAhc8v09uphZ1JdlCvMv85jlghrcApQF3hhsvJtmJI+ 6tVBo0+xGHiCXBFhn+7nH7WbO2q8GZQuc9S/1Ht+a7Qdsrvyx8a+2DWS97d/8Q== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126718; 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=Byt4HGbil0rVvNDsL3I2GGtAERtLtI/3At12EpajhbY=; b=HQH5cWAHH6ZhormCJh1tnyOZ0SFwLCv+KOcpX71TdYwDMJUw3syp1F86Vzchxd7awzaNYn 2matZLP+Qffd211fxlxw5hhDEhUrf4Ac0TITGn80303CzRI5XGNpvUfE79N3ECAbqjKGzR qTkX/NLH3SLxd8DSeB0roxU5wjeQ+LaghZLfmq79YsLVVv7CbTYtNbsRjDJHp1ECmvdCAf KIGenIuHM93MP9XR99nldBDPwPMPaFnzNbqlNa7/tQewrwiFo0CutyYwj4p8C685dDQ5QB 1mNXJJoXar5C3G9tLorvDvsm09GUldoUJna+1tWspeJSGNwIRJvpaEuq8AmZPg== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (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 B154A10D19C7; Mon, 4 Jun 2018 16:38:38 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 1/7] nitsi: Create "nitsi" Makefile target Date: Mon, 4 Jun 2018 16:38:26 +0100 Message-Id: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 X-Spamd-Result: default: False [-4.97 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.87)[-0.956,0] X-Spam-Status: No, score=-4.97 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer 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" Calling "make nitsi" will run all nitsi tests Signed-off-by: Michael Tremer Reviewed-by: Jonatan Schlag Reviewed-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

Am Mo, 4. Jun, 2018 um 5:38 schrieb Michael Tremer <michael.tremer@ipfire.org>:
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org> --- Makefile.am | 22 ++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 23 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7a755cc264a1..c02376462cf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,6 +89,10 @@ INSTALL_EXEC_HOOKS += \ # ------------------------------------------------------------------------------ +AM_V_NITSI = $(AM_V_NITSI_$(V)) +AM_V_NITSI_ = $(AM_V_NITSI_$(AM_DEFAULT_VERBOSITY)) +AM_V_NITSI_0 = @echo " NITSI " $@; + AM_V_XSLT = $(AM_V_XSLT_$(V)) AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY)) AM_V_XSLT_0 = @echo " XSLT " $@; @@ -543,3 +547,21 @@ TESTS = \ test/functions/ip/ip_prefix_is_valid \ test/functions/ip/ip_protocol_is_supported \ test/functions/ip/ip_split_prefix + +# - NITSI tests ---------------------------------------------------------------- + +NITSI_TESTS = \ + test/nitsi/test/hello-world + +EXTRA_DIST += \ + test/nitsi/test/hello-world/recipe \ + test/nitsi/test/hello-world/settings + +NITSI_ENVIRONMENT = + +.PHONY: $(NITSI_TESTS) +$(NITSI_TESTS): + $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ + +.PHONY: nitsi +nitsi: $(NITSI_TESTS) diff --git a/configure.ac b/configure.ac index 7cb5ef1110fa..515941451aba 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,7 @@ AC_PROG_LN_S AC_PROG_MKDIR_P AC_PROG_SED +AC_PATH_PROG([NITSI], [nitsi]) AC_PATH_PROG([XSLTPROC], [xsltproc]) # pkg-config From patchwork Tue Jun 5 01:38:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1796 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id D6B3360B61 for ; Mon, 4 Jun 2018 17:38:40 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id AE84110F8B8C; Mon, 4 Jun 2018 16:38:40 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126720; h=from:from:sender: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:list-id:list-unsubscribe:list-subscribe:list-post; bh=TcCyGHmY1rU50JfyoM1djDtcyzY155aBQFUQaeFMB5w=; b=ego2qx93xu+IGHP2jTXHXgh9CdII3lREa9ujLrU/ZewIKe0R/cx9cbGcwZv2opX50R6Fck 3U06NsrJL7eV14Bxzg0RC5pSCRerbPIf/RSDNrzQQl4cv9fmOlcLA033+4uoYi32u4jL4P kuGEuC/1Ui3fIu1MOcfrLrhXBesobspBq6oknvAg7pGYDG5ZdU2aL/oAcSe1c1dwq4NppL FQHnIz6cO9NvzRiUV43KCz48oOpOP3MZXb2xHo1sE9pIxivx1x7R36m1f1fPG8SD3LRNoU ymRwUdgSHB82jeLYISdLu/akX37NuDxQCHXF67emMA3lcjAAxoIiZRTmPAN99w== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126719; 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=TcCyGHmY1rU50JfyoM1djDtcyzY155aBQFUQaeFMB5w=; b=DfHNosBhkHRhv0G5lv65oRH02ItQvsp8I7TlvsTMREZDjV50h6wpn11NtuSl0zU1ZEwV32 q2Ho8WfM4CTH/N/WD87YcbmdpJRjkd4hS7QKd6VJDImVnhkVvBXLWZv1qyTW3CJqY99p+G NQnGKN+GUTDE43dLA51wSTlCLuALSfi7gFAmxwQfOCCuYWLsj0Pz2GztKK5T/+h/mMsOZn U1VLCnKfNCOJqabI+kDhsCJfMSu6WQHqlGld62X/pknK7WMHmV9PCDpmkp4H4/CHidN9td mRec5HrBU5POcNCzFy6hQtMWCqY57TdEy6ir9qLtEomLpHuotJWItmko1aBtXQ== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (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 0B5F510D19E3; Mon, 4 Jun 2018 16:38:39 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 2/7] Build source tarball before running any NITSI tests Date: Mon, 4 Jun 2018 16:38:27 +0100 Message-Id: <20180604153832.331239-2-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org> References: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-7.05 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.95)[-0.983,0]; REPLY(-2.00)[] X-Spam-Status: No, score=-7.05 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer 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" Signed-off-by: Michael Tremer Reviewed-by: Jonatan Schlag Reviewed-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

Am Mo, 4. Jun, 2018 um 5:38 schrieb Michael Tremer <michael.tremer@ipfire.org>:
--- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c02376462cf4..88c56bcf68eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -560,7 +560,7 @@ EXTRA_DIST += \ NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) -$(NITSI_TESTS): +$(NITSI_TESTS): dist $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ .PHONY: nitsi From patchwork Tue Jun 5 01:38:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1797 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 5D15360BB3 for ; Mon, 4 Jun 2018 17:38:41 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 229C810F8B82; Mon, 4 Jun 2018 16:38:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126721; h=from:from:sender: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:list-id:list-unsubscribe:list-subscribe:list-post; bh=9h9lKz2uX3/ohyijY2PDQta95Bb4Yi/kGK71mGGkAPk=; b=0VscmvISgcBZ/RxvU3f+SZirGSVtGFBZwurh8aLpFGaINmrWi5tXewONtxnAHsmqER4ode jXzbAVhZyQmsnG0JkQLQjh+eVkChQG19xJQTwSO1eqliJe3L+2Yxn9YuFx7nuCj5DiwQfD 5m8HEizojPhU2E6aAKI0XvvJr2tY+XeOP88YcFJJCvDwyhVA6yn2eGTxDKy0aSrLi7hPZj zEMCKURt56lrdCa1O7ZYDOudN/Ze/PaTxlD2IeomP4xwBId3pBA7jJFFqqsfxL+Bp3kXI+ lRQpOFLW+j7LkyqrCwPW3e9XELSCK5onHUP2TF3w5CaMWsD5a77U7Qttdvh9QQ== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126719; 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=9h9lKz2uX3/ohyijY2PDQta95Bb4Yi/kGK71mGGkAPk=; b=QHaUyC6Wvhx5V3Akh7s7907vvnc7tc21p5YxijpuYjlIsA/kAbkkwx6gQzP/gDlijnEkX+ lxOXtrliWAdZsUzWO0iBonzbNEL9OwxksQQYdQH92SY+b3NV3Ej+6HuWINAoqEilSabOc3 /ev/YB+1mljYTpVPPBoVWN+ySaMRaHCM1kwQUOSI8pQg5BfTSVeR3fcMsslx641tfqrN0F PyQclO0xs+LMpcft7Oo7ZV/8OPZmsY5RM+N/M2U9y7CWn4NTnvehWSD2xjA7LMxd+MNjDI CP0br2N98xDCahUXttUAOI+6ycCuOlgwqjZlYDGeYbLkgadQa4//uqLjXDrMfw== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (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 3F26E10D19C7; Mon, 4 Jun 2018 16:38:39 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 3/7] Makefile: Remove any excess substitution rules Date: Mon, 4 Jun 2018 16:38:28 +0100 Message-Id: <20180604153832.331239-3-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org> References: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-7.05 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.95)[-0.984,0]; REPLY(-2.00)[] X-Spam-Status: No, score=-7.05 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer 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" Signed-off-by: Michael Tremer Reviewed-by: Jonatan Schlag Reviewed-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

Am Mo, 4. Jun, 2018 um 5:38 schrieb Michael Tremer <michael.tremer@ipfire.org>:
--- Makefile.am | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 88c56bcf68eb..73c79f501f99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -502,16 +502,7 @@ SED_PROCESS = \ $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \ < $< > $@ -src/functions/functions: src/functions/functions.in Makefile - $(SED_PROCESS) - -src/ppp/ip-updown: src/ppp/ip-updown.in Makefile - $(SED_PROCESS) - -src/systemd/%: src/systemd/%.in Makefile - $(SED_PROCESS) - -src/%.pc: src/%.pc.in Makefile +%: %.in Makefile $(SED_PROCESS) INSTALL_DIRS += \ From patchwork Tue Jun 5 01:38:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1798 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 9E4FB60C06 for ; Mon, 4 Jun 2018 17:38:41 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 79E9F10D19E3; Mon, 4 Jun 2018 16:38:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126721; h=from:from:sender: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:list-id:list-unsubscribe:list-subscribe:list-post; bh=5ZucBLeWNNbxN7+H4FoDY4n7UUA51hPt5YBXOVktqiM=; b=CyQGOc6QP3ThLusyWLtT2G9id49jLDjXsPoCkCtTfR/jYu+6dDbIyY2vsimcARraKCmfyy PG1cVPuFoYG1RgGyGfp3GxTd3HOOlQBdJuKIYROxNC475ZUEEhTV+6HUqkgrJ/f7WoS855 SmlAopkUdS3iFXoBGv6v3glOHn6kdXLSJaZ4Efm2dmrea2iZHpxxUA0dmhb1frDFqxHIXw IbthhqizJ2DBEepdaO5+m4hYD93+93CJ/i0sF1EQJ5NGRZaNTrL99+1Y8U386qFZY2Lv3N 8kQrv1wxOPbcYwSvY9nZS2W8KyY3hOq6SIzQUqSIsmJxxWufd5vLQeLXGX7a9Q== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126719; 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=5ZucBLeWNNbxN7+H4FoDY4n7UUA51hPt5YBXOVktqiM=; b=BBKmFTQDFXfyCDRrcpKhl+MWWhQaPada365L52t/cutdVxorYTODj9dUiWv7LuyDdyGZ2B RrhTu6FDELsaxJI7JCwdLzfKWpNVrUyzQWEoQId+9qEFKd1+/PQfm2PM/dA3KMNLt608r1 D9qXWQIuVGfqkY9XNGuzzvvL48/XQudAlyDK7IKSxu74ebRn31VjMWdKYYJkpUVhkRhX8a Jn9PbIYWyqWoKH6GMWZj80eVd8w+DMPg72Or7iMBud/pRYNEzje4vgAG2kfKCsBID7uvxM inE1JQcqswFqjiWcQecTu3VFBdhBDkJNVvzJmtNu4ow45dgTHMH+RaPpCKH++Q== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (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 69DB210D19E3; Mon, 4 Jun 2018 16:38:39 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 4/7] nitsi: Add a test that calls "make check" in the virtual environment Date: Mon, 4 Jun 2018 16:38:29 +0100 Message-Id: <20180604153832.331239-4-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org> References: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-7.06 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.96)[-0.985,0]; REPLY(-2.00)[] X-Spam-Status: No, score=-7.06 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer 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" Signed-off-by: Michael Tremer --- Makefile.am | 16 ++++++++++++---- test/nitsi/test/make-check/.gitignore | 2 ++ test/nitsi/test/make-check/recipe.in | 3 +++ test/nitsi/test/make-check/settings.in | 12 ++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 test/nitsi/test/make-check/.gitignore create mode 100644 test/nitsi/test/make-check/recipe.in create mode 100644 test/nitsi/test/make-check/settings.in diff --git a/Makefile.am b/Makefile.am index 73c79f501f99..a0d57689d97e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -490,6 +490,7 @@ substitutions = \ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ '|PACKAGE_URL=$(PACKAGE_URL)|' \ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ + '|builddir=$(abs_builddir)|' \ '|prefix=$(prefix)|' \ '|exec_prefix=$(exec_prefix)|' \ '|sbindir=$(sbindir)|' \ @@ -542,17 +543,24 @@ TESTS = \ # - NITSI tests ---------------------------------------------------------------- NITSI_TESTS = \ - test/nitsi/test/hello-world + test/nitsi/test/hello-world \ + test/nitsi/test/make-check EXTRA_DIST += \ test/nitsi/test/hello-world/recipe \ - test/nitsi/test/hello-world/settings + test/nitsi/test/hello-world/settings \ + test/nitsi/test/make-check/recipe.in \ + test/nitsi/test/make-check/settings.in + +CLEANFILES += \ + test/nitsi/test/make-check/recipe \ + test/nitsi/test/make-check/settings NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) -$(NITSI_TESTS): dist +$(NITSI_TESTS): % : %/recipe %/settings $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ .PHONY: nitsi -nitsi: $(NITSI_TESTS) +nitsi: dist $(NITSI_TESTS) diff --git a/test/nitsi/test/make-check/.gitignore b/test/nitsi/test/make-check/.gitignore new file mode 100644 index 000000000000..5fd84c8fa188 --- /dev/null +++ b/test/nitsi/test/make-check/.gitignore @@ -0,0 +1,2 @@ +/recipe +/settings diff --git a/test/nitsi/test/make-check/recipe.in b/test/nitsi/test/make-check/recipe.in new file mode 100644 index 000000000000..13d664b8db9a --- /dev/null +++ b/test/nitsi/test/make-check/recipe.in @@ -0,0 +1,3 @@ +alice: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACKAGE_VERSION@ +alice: ./configure --prefix=/usr && make -j2 +alice: make check diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-check/settings.in new file mode 100644 index 000000000000..cac865de8bad --- /dev/null +++ b/test/nitsi/test/make-check/settings.in @@ -0,0 +1,12 @@ +[DEFAULT] +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/ + +[VIRTUAL_ENVIRONMENT] +Name = basic +path = ../../virtual-environment/basic From patchwork Tue Jun 5 01:38:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1799 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id E759360C56 for ; Mon, 4 Jun 2018 17:38:41 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id CBCA110F8B86; Mon, 4 Jun 2018 16:38:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126721; h=from:from:sender: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:list-id:list-unsubscribe:list-subscribe:list-post; bh=VR97LCJjfq65L14o8N9Co2BKGWh1sfPk50xURnY29y8=; b=VuypdVorp8ozqroeO4medmnRM7c6UiAp0E9i4VImIBGyMH3Slz9sN70+XzfBdVxPjY9Nke Vg2ncoaV4n1R/H7+LchOkBmPtdEEEYX6MqXkfh91DPTVl3NJbxySIoPFQUj5+1tKhqUP+2 BoChkxpiuHpQYmy2IUx9c0So9uAyk8sjHTK+JWt7n8DWBcFDcW2ObXCjDlxpHikVnfBHzX sVtLPosqQ4B+uU5RKFTmrY/6eDaVGHk1kCTVim2QMd+BGk0HaD/JDYT158jMVAH09RF/l/ +wHXKcywjxmbkxFBSzAjonzVBv/SnXQCrwUs8XjseR8Lo6rRTt7aEPx6c7mYOg== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126719; 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=VR97LCJjfq65L14o8N9Co2BKGWh1sfPk50xURnY29y8=; b=AZWFUuxWTgFcv22DocVcvmfK0cwarjVXnZ7JhQFh2p/M7YGCf9W0YOdR80lrxv1o0BKl8b Ft6lEkrWbH1w7HrYeF5ZvQyIEvjt0Ji6p7dzkpzP7H+/i/YoyCkuj+CZhZvz+7UlILeACY 0UQ2gpao3PYDKj2RP0PveuKW1Ml74rPzKWaeW20hhwCKiaGHiO7aBixCJWQ+HJ4Z4AE0g+ WBj7dNUYCiEqcPEjW6Bhna0OGHwAb1K9vWiT3/cjgBzvAfsKhnFhqqXEQPD5AOyFcdzUyo LaK1u3L4gl3NQuTYjKpEv7+BIKDWqaTRLFGdzmpGFoS+NQItG3AY5Md5Cwlubw== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (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 9613810D19C7; Mon, 4 Jun 2018 16:38:39 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 5/7] Makefile: Ship virtual environment files in release tarball Date: Mon, 4 Jun 2018 16:38:30 +0100 Message-Id: <20180604153832.331239-5-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org> References: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-7.06 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.96)[-0.985,0]; REPLY(-2.00)[] X-Spam-Status: No, score=-7.06 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer 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" Signed-off-by: Michael Tremer --- Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile.am b/Makefile.am index a0d57689d97e..06b6cddd2b74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -542,6 +542,19 @@ TESTS = \ # - NITSI tests ---------------------------------------------------------------- +# Files for the virtual environment +EXTRA_DIST += \ + 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/network/network1/network.xml \ + test/nitsi/virtual-environment/basic/network/network2/network.xml \ + test/nitsi/virtual-environment/basic/network/network3/network.xml \ + test/nitsi/virtual-environment/basic/network/network4/network.xml \ + test/nitsi/virtual-environment/basic/README \ + test/nitsi/virtual-environment/basic/settings + NITSI_TESTS = \ test/nitsi/test/hello-world \ test/nitsi/test/make-check From patchwork Tue Jun 5 01:38:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1800 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 45D0E60B60 for ; Mon, 4 Jun 2018 17:38:43 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 2927D10F8B83; Mon, 4 Jun 2018 16:38:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126723; h=from:from:sender: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:list-id:list-unsubscribe:list-subscribe:list-post; bh=qkHG24MDpAc4dAzQHmOdfvRNH5Yx/pd7Wn6GkoJeoOw=; b=u7+qer8G14Z+rirk1oGLciU34+UmsEl/IQQ4q6aoUi5Ja+knuX7hoCcB5zro2D+2LIXsWN YQdEoPYTo8+bxjPB8VA5yHsFsz31m/VjbYCZP7G+NwwF2uoXuHbyq9SR/ExyDpoJw77K+4 xN/aom5d9YnuxmSDQ0UI5DDFE9hm8QRTKUqxyr6OKkbBz5S7oEuzoCSxYz36Ly7z2n++KN xOMqt5+8WWYjycCKZkas4eOogv8fZ2wEVHB8sdtDJpLVMrCuCPIReu45OFXAgJM0gWO1au RS/bv1axrc1fHbT6jiUZmpvEErtE8jwwJbhyFd9Gx+FCBrzaRSATjOExI0aInQ== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126719; 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=qkHG24MDpAc4dAzQHmOdfvRNH5Yx/pd7Wn6GkoJeoOw=; b=M01ZCZFwzhw63ZdrXchVlFhG+7hABp0UHMeUxc3zBrJoPr26y4Wk2XMp0EM6yIVm6kTUnE JlD/QBS96vuOcVwOzlOgubzXOZwR9hYx2gGvCGpnaAappafO24KrRdqLr/6Up5Y4J+lGl4 NT+cjLvb3Drb+MipYcAur+jqPSL0NvkmhOpVjqPZY8f1iSE7THiDNY8leDubv8gZL/42W7 1murVzwqFpCgLx1F7brqooP4bfWHEaPhkIEw2Z14mrj6Shx8NyocLLknudrhpoi9hlilQk epLH8HKsy5GLW/wPdLOEr4iHrQr2jtjV7MXLdTwy7tqT1xUBzxhcDfjkXIfe8w== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (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 C049910D19E3; Mon, 4 Jun 2018 16:38:39 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 6/7] NITSI: Automatically download required images Date: Mon, 4 Jun 2018 16:38:31 +0100 Message-Id: <20180604153832.331239-6-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org> References: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-7.07 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.97)[-0.991,0]; REPLY(-2.00)[] X-Spam-Status: No, score=-7.07 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer 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" This patch lets make automatically download all required images and extracts them. Signed-off-by: Michael Tremer Signed-off-by: Michael Tremer <michael.tremer@ipfire.org> --- Makefile.am | 40 +++++++++++++++++-- configure.ac | 1 + test/nitsi/virtual-environment/.gitignore | 1 + .../basic/machines/.gitignore | 1 + .../alice/{machine.xml => machine.xml.in} | 2 +- .../snapshot.xml => alice/snapshot.xml.in} | 2 +- .../bob/{machine.xml => machine.xml.in} | 2 +- .../snapshot.xml => bob/snapshot.xml.in} | 2 +- 8 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 test/nitsi/virtual-environment/.gitignore create mode 100644 test/nitsi/virtual-environment/basic/machines/.gitignore rename test/nitsi/virtual-environment/basic/machines/alice/{machine.xml => machine.xml.in} (98%) rename test/nitsi/virtual-environment/basic/machines/{bob/snapshot.xml => alice/snapshot.xml.in} (69%) rename test/nitsi/virtual-environment/basic/machines/bob/{machine.xml => machine.xml.in} (98%) rename test/nitsi/virtual-environment/basic/machines/{alice/snapshot.xml => bob/snapshot.xml.in} (70%) diff --git a/Makefile.am b/Makefile.am index 06b6cddd2b74..f4b8ba13dbea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,6 +89,10 @@ INSTALL_EXEC_HOOKS += \ # ------------------------------------------------------------------------------ +AM_V_DOWNLOAD = $(AM_V_DOWNLOAD_$(V)) +AM_V_DOWNLOAD_ = $(AM_V_DOWNLOAD_$(AM_DEFAULT_VERBOSITY)) +AM_V_DOWNLOAD_0 = @echo " LOAD " $@; + AM_V_NITSI = $(AM_V_NITSI_$(V)) AM_V_NITSI_ = $(AM_V_NITSI_$(AM_DEFAULT_VERBOSITY)) AM_V_NITSI_0 = @echo " NITSI " $@; @@ -496,7 +500,8 @@ substitutions = \ '|sbindir=$(sbindir)|' \ '|networkdir=$(networkdir)|' \ '|helpersdir=$(helpersdir)|' \ - '|utildir=$(utildir)|' + '|utildir=$(utildir)|' \ + '|VIRTUAL_ENVIRONMENT_IMAGES_DIR=$(VIRTUAL_ENVIRONMENT_IMAGES_DIR)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -543,7 +548,7 @@ TESTS = \ # - NITSI tests ---------------------------------------------------------------- # Files for the virtual environment -EXTRA_DIST += \ +VIRTUAL_ENVIRONMENT_FILES = \ 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 \ @@ -555,6 +560,30 @@ EXTRA_DIST += \ test/nitsi/virtual-environment/basic/README \ test/nitsi/virtual-environment/basic/settings +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 + +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 + +# Virtual Machine Images +VIRTUAL_ENVIRONMENT_IMAGES = \ + $(VIRTUAL_ENVIRONMENT_IMAGES_DIR)/ipfire-alice-2.qcow2 \ + $(VIRTUAL_ENVIRONMENT_IMAGES_DIR)/ipfire-bob.qcow2 + +DISTCLEANFILES += \ + $(VIRTUAL_ENVIRONMENT_IMAGES) + +VIRTUAL_ENVIRONMENT_IMAGES_DIR = $(abs_builddir)/test/nitsi/virtual-environment/.images +VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ + https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/ + NITSI_TESTS = \ test/nitsi/test/hello-world \ test/nitsi/test/make-check @@ -572,8 +601,13 @@ CLEANFILES += \ NITSI_ENVIRONMENT = .PHONY: $(NITSI_TESTS) -$(NITSI_TESTS): % : %/recipe %/settings +$(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ .PHONY: nitsi nitsi: dist $(NITSI_TESTS) + +# Downloads a virtual image file and extracts it +$(VIRTUAL_ENVIRONMENT_IMAGES): + $(AM_V_DOWNLOAD)$(MKDIR_P) $(dir $@) && \ + $(WGET) -qO - $(VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL)/$(notdir $@).xz | xz -qd > $@ diff --git a/configure.ac b/configure.ac index 515941451aba..e84bec7d284a 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ AC_PROG_MKDIR_P AC_PROG_SED AC_PATH_PROG([NITSI], [nitsi]) +AC_PATH_PROG([WGET], [wget]) AC_PATH_PROG([XSLTPROC], [xsltproc]) # pkg-config diff --git a/test/nitsi/virtual-environment/.gitignore b/test/nitsi/virtual-environment/.gitignore new file mode 100644 index 000000000000..5a345eca37b4 --- /dev/null +++ b/test/nitsi/virtual-environment/.gitignore @@ -0,0 +1 @@ +/.images diff --git a/test/nitsi/virtual-environment/basic/machines/.gitignore b/test/nitsi/virtual-environment/basic/machines/.gitignore new file mode 100644 index 000000000000..89b260551efd --- /dev/null +++ b/test/nitsi/virtual-environment/basic/machines/.gitignore @@ -0,0 +1 @@ +*/*.xml diff --git a/test/nitsi/virtual-environment/basic/machines/alice/machine.xml b/test/nitsi/virtual-environment/basic/machines/alice/machine.xml.in similarity index 98% rename from test/nitsi/virtual-environment/basic/machines/alice/machine.xml rename to test/nitsi/virtual-environment/basic/machines/alice/machine.xml.in index 5f5b4aca5017..be8da3886021 100644 --- a/test/nitsi/virtual-environment/basic/machines/alice/machine.xml +++ b/test/nitsi/virtual-environment/basic/machines/alice/machine.xml.in @@ -28,7 +28,7 @@ - +
diff --git a/test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml b/test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml.in similarity index 69% rename from test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml rename to test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml.in index a8311a261fea..8d2d1c05f5ad 100644 --- a/test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml +++ b/test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml.in @@ -2,7 +2,7 @@ Snapshot to undo all changes from this test no - + diff --git a/test/nitsi/virtual-environment/basic/machines/bob/machine.xml b/test/nitsi/virtual-environment/basic/machines/bob/machine.xml.in similarity index 98% rename from test/nitsi/virtual-environment/basic/machines/bob/machine.xml rename to test/nitsi/virtual-environment/basic/machines/bob/machine.xml.in index 60682112db17..f314e8edc5aa 100644 --- a/test/nitsi/virtual-environment/basic/machines/bob/machine.xml +++ b/test/nitsi/virtual-environment/basic/machines/bob/machine.xml.in @@ -28,7 +28,7 @@ - +
diff --git a/test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml b/test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in similarity index 70% rename from test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml rename to test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in index fff9b97752e0..f15d19adc5d2 100644 --- a/test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml +++ b/test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in @@ -2,7 +2,7 @@ Snapshot to undo all changes from this test no - + From patchwork Tue Jun 5 01:38:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1801 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 8A30760B61 for ; Mon, 4 Jun 2018 17:38:43 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 6FB4F10F8B88; Mon, 4 Jun 2018 16:38:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126723; h=from:from:sender: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:list-id:list-unsubscribe:list-subscribe:list-post; bh=Kr+4w8SIPohXokAbeizjk3vDtsjB2eWraGk/LIn01sU=; b=G/fWZX9ZhYqfbOy32HPZpHyv5NjdK+1nvOTSfoLRc+exPFfcdBhhvbLH0+mA4vH3VPHKQc ZK0OjH+vYWxV3DgcLPrzYthosifOrICkwXILqTQaBrjlEkUxvguQ7JdTdjucQcBxOusowO BHEGMW92k58fl2m4WWaI6TT2hJKPEXFCLqsERSnL767eqdukPrNzZucLQAEWCKVtMZBCIP 07GWbacTwdaCMZ73PgWgKBuzvrW9RgbJrqwOljwEQchgYhW8Ygv8UTxEosWbZDmJYMdBtw iE7Ukhn5kfwvfsmJQnKLc6My2vJKxqI0fh8IUCschr4A6xgyWCAQqwkWE7h1Nw== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1528126721; 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=Kr+4w8SIPohXokAbeizjk3vDtsjB2eWraGk/LIn01sU=; b=gD0e/1yndgONh1WSxvKng24f40XUkcqjiPTcpTGX1WoBVH2YQdh2zwd5SQIyZ+dgAx4xLP QJS626kL4N5FBQYdrVeAoZSmMpcZYLf0VAjoprNtgX+lNKFiyUKPzkWd1RE6Yt08kQ0z3M BzrJR6/3uvWukzwqtjaKtAFPzpUE2rzWY40j7Ep5ON1TUQX1XhVIOv0X/NxuvR167AffWa iqCYno8EnOWLixeIPUYsD9WKdzf48eNvBdMsu+71PWzRnvvFxC36+6UkpBbKToI8YdiXwh MuZmEdTiwcPeudR3kjyID5bQBJnK5a1/l4fkXwpnBt0483VTM6OPqZOnKpboQw== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (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 E8CD010F8B8F; Mon, 4 Jun 2018 16:38:40 +0100 (BST) From: Michael Tremer To: network@lists.ipfire.org Subject: [PATCH 7/7] Drop README file from virtual environment Date: Mon, 4 Jun 2018 16:38:32 +0100 Message-Id: <20180604153832.331239-7-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604153832.331239-1-michael.tremer@ipfire.org> References: <20180604153832.331239-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-7.08 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM(-2.98)[-0.994,0]; REPLY(-2.00)[] X-Spam-Status: No, score=-7.08 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer 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" Those instructions are no longer valid Signed-off-by: Michael Tremer Reviewed-by: Jonatan Schlag Reviewed-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

Am Mo, 4. Jun, 2018 um 5:38 schrieb Michael Tremer <michael.tremer@ipfire.org>:
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org> --- Makefile.am | 1 - test/nitsi/virtual-environment/basic/README | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 test/nitsi/virtual-environment/basic/README diff --git a/Makefile.am b/Makefile.am index f4b8ba13dbea..81393999cbc6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -557,7 +557,6 @@ VIRTUAL_ENVIRONMENT_FILES = \ test/nitsi/virtual-environment/basic/network/network2/network.xml \ test/nitsi/virtual-environment/basic/network/network3/network.xml \ test/nitsi/virtual-environment/basic/network/network4/network.xml \ - test/nitsi/virtual-environment/basic/README \ test/nitsi/virtual-environment/basic/settings EXTRA_DIST += \ diff --git a/test/nitsi/virtual-environment/basic/README b/test/nitsi/virtual-environment/basic/README deleted file mode 100644 index caa92da252b8..000000000000 --- a/test/nitsi/virtual-environment/basic/README +++ /dev/null @@ -1,7 +0,0 @@ -Images for these test can be downloaded from: -https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/ - -You must decompress these images with 'unxz' and place them in: -/var/lib/libvirt/images - -