From nobody Thu May 18 20:12:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QMh3P1wsfz4BykD; Thu, 18 May 2023 20:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QMh3P1QZJz3tTl; Thu, 18 May 2023 20:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684440753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaxqzdR54w0a04qGgyUngefFcg2RqHE1UR8772F/xLs=; b=ECLj4bkhLiDkm3c3CmTAunX3mhKmUloJGwIW3/T9UoepB4qVXOn8hyQeG7GV4DZadVW1Ay /sygzs8ZR6ywSB385O/0VouB8PF5OrOq1KFJaUTKUpkgWDP2QECC2QOEQvU8uCkVdwnOpS zf1Adfz+OSizvaG2OcqevNIZM8eEShi1elWmR5qE5aOWwn8e1i7Jt70KxjhWC8weC1JgJB cWIw781syqgdrQGUzmUbmQQDKUpSiX46Lky176yhbcN3Lnlt8KnJgZD+oj8k+IHDxxTqh9 ngGf8Vj9EQ7geWjkqDLkQfxbmXgebqzKaGj0iDapWXFs19iHtmrghswNaK3UKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684440753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaxqzdR54w0a04qGgyUngefFcg2RqHE1UR8772F/xLs=; b=Tfzcc2GEPIK1i5PBwthdEWVfpOG4WfGKXbjh0PkmuFGhvHXSZ2fs2i1v2ryS7r69mhWXOp cZ0sagafwlX6cnUbAOpXYxBi2CVu3BZiwk56Vt+6z2+AJgmIpAgn3Ki6gJ6c9/PIw72W+r 6v161Ng9OK6JsbJO/PTyCu6Vd+/YkeA2QW50NfIXEgp9DB16c4jem8iRTsDmZhieRD+X42 OgEZ5WRg+2/S0BMOD+exM6IyU1wIZpt7xZUTPDhPbGS94IgFCUTho0B3mp9MtaHsPLSEZG 77BzPhiV0V26CAm8GNKtydGGhxn96o5k0m2VxUbxPCY1tA8QSjaS6NxXC3ewaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684440753; a=rsa-sha256; cv=none; b=U4xXIczz5wzp8vHGt6RoQs7ShK3RpPA5R53FjaU0bt1kSUdqVpwT0uHQbgZ6Qedy7fJzVO 9R47T0HYVJiQgOa5JQKcZq7uVA5F+hEU+XoaEy68RDMFiVevLQrQglWHVnIUaCQatgZdNh 8zXH/w5GnYy60lwMAb+MxpcOUxHSOAi+mnC8TjUnOTeGIvq6iKz4tOf8W4wSPaxifdvMKY Kk1ajcGxa8B6H13nbJc3RLm+aBJ5pj9PCwICn1tbkjvIX4msJJnSBVZbXOtrwGBHZCl1ly Mz2BlpwMScRIQZr6crFGXsDpvI0+1a4miGlXyg+Ic8CGJHEhLf9RZw4IhGpX+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QMh3P0V81z10DX; Thu, 18 May 2023 20:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34IKCWRO032332; Thu, 18 May 2023 20:12:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34IKCWu4032331; Thu, 18 May 2023 20:12:32 GMT (envelope-from git) Date: Thu, 18 May 2023 20:12:32 GMT Message-Id: <202305182012.34IKCWu4032331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6408d025cf34 - main - carp test: improve jail names for unicast_ll_v6 test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6408d025cf343aee6abeeb83ed8f284ad283e1dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6408d025cf343aee6abeeb83ed8f284ad283e1dc commit 6408d025cf343aee6abeeb83ed8f284ad283e1dc Author: Kristof Provost AuthorDate: 2023-05-18 20:06:37 +0000 Commit: Kristof Provost CommitDate: 2023-05-18 20:12:08 +0000 carp test: improve jail names for unicast_ll_v6 test Rename the jails used in the unicast_ll_v6 test, to ensure the jail names are unique to this test. That is one of the requirements for running these tests in parallel. --- tests/sys/netinet/carp.sh | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 7508a6996fcd..5175435a8770 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -283,48 +283,49 @@ unicast_ll_v6_body() { carp_init + j=carp_uni_ll_v6 + bridge=$(vnet_mkbridge) epair_one=$(vnet_mkepair) epair_two=$(vnet_mkepair) - vnet_mkjail carp_uni_v6_one ${bridge} ${epair_one}a ${epair_two}a - vnet_mkjail carp_uni_v6_two ${epair_one}b - vnet_mkjail carp_uni_v6_three ${epair_two}b + vnet_mkjail ${j}_one ${bridge} ${epair_one}a ${epair_two}a + vnet_mkjail ${j}_two ${epair_one}b + vnet_mkjail ${j}_three ${epair_two}b - jexec carp_uni_v6_one ifconfig ${bridge} addm ${epair_one}a \ + jexec ${j}_one ifconfig ${bridge} addm ${epair_one}a \ addm ${epair_two}a - jexec carp_uni_v6_one ifconfig ${epair_one}a up - jexec carp_uni_v6_one ifconfig ${epair_two}a up - jexec carp_uni_v6_one ifconfig ${bridge} inet6 2001:db8::0:4/64 up \ + jexec ${j}_one ifconfig ${epair_one}a up + jexec ${j}_one ifconfig ${epair_two}a up + jexec ${j}_one ifconfig ${bridge} inet6 2001:db8::0:4/64 up \ no_dad - jexec carp_uni_v6_one ifconfig ${bridge} inet6 alias 2001:db8:1::1/64 \ + jexec ${j}_one ifconfig ${bridge} inet6 alias 2001:db8:1::1/64 \ no_dad up - jexec carp_uni_v6_two ifconfig ${epair_one}b inet6 2001:db8:1::2/64 \ + jexec ${j}_two ifconfig ${epair_one}b inet6 2001:db8:1::2/64 \ no_dad up - jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 2001:db8:1::3/64 \ + jexec ${j}_three ifconfig ${epair_two}b inet6 2001:db8:1::3/64 \ no_dad up - ll_one=$(jexec carp_uni_v6_two ifconfig ${epair_one}b | awk "/ .*%${epair_one}b.* / { print \$2 }" | cut -d % -f 1) - ll_two=$(jexec carp_uni_v6_three ifconfig ${epair_two}b | awk "/ .*%${epair_two}b.* / { print \$2 }" | cut -d % -f 1) + ll_one=$(jexec ${j}_two ifconfig ${epair_one}b | awk "/ .*%${epair_one}b.* / { print \$2 }" | cut -d % -f 1) + ll_two=$(jexec ${j}_three ifconfig ${epair_two}b | awk "/ .*%${epair_two}b.* / { print \$2 }" | cut -d % -f 1) - jexec carp_uni_v6_two ifconfig ${epair_one}b inet6 add vhid 1 \ + jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 \ peer6 ${ll_two} \ 2001:db8::0:1/64 - jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 add vhid 1 \ + jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 \ peer6 ${ll_one} \ 2001:db8::0:1/64 # Sanity check - atf_check -s exit:0 -o ignore jexec carp_uni_v6_two \ + atf_check -s exit:0 -o ignore jexec ${j}_two \ ping -6 -c 1 2001:db8:1::3 - wait_for_carp carp_uni_v6_two ${epair_one}b \ - carp_uni_v6_three ${epair_two}b + wait_for_carp ${j}_two ${epair_one}b \ + ${j}_three ${epair_two}b - atf_check -s exit:0 -o ignore jexec carp_uni_v6_one \ + atf_check -s exit:0 -o ignore jexec ${j}_one \ ping -6 -c 3 2001:db8::0:1 - } unicast_ll_v6_cleanup()