From patchwork Mon Mar 21 11:43:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1607703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=SHblGrvK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KMXpW4zPSz9s0r for ; Mon, 21 Mar 2022 22:44:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nWGSZ-0002iW-KV; Mon, 21 Mar 2022 11:44:27 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nWGSY-0002iJ-2U for kernel-team@lists.ubuntu.com; Mon, 21 Mar 2022 11:44:26 +0000 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id C41CB3F1AC for ; Mon, 21 Mar 2022 11:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1647863065; bh=uawFGmD6DCODlzed6YMLY+prrSY/4uvDU6GsqrIpGCI=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=SHblGrvK6P/AWHCp6+BeyV6hbqLnTl1vB2gc5bFKEZc3i9Bf2iHURmvCBLoqFgrEj EdctSpJUuT6cbFQ7Ep6uo9T0zVqySiEu5/Li+fCCXpmtUkYQSIkwx592tB8WZoulU0 5r8zHJwi2vO/WZSbg9HeJD8exNqV+OY3XnpWbpjzxEXBDeDkR0xEOgutSU5ZnE/00n +kVBBkiDeHOZRTQsEc4bNA2FZdqkXXBqeZ5vW0LmLDczgwDWUbY5fEy7P0vaPTwQbr vZq1XKquE7721OC8lypjvEyrXdcyzkyhD0hwufTk2ww6THU1wwWA+1hGvD332N+BGa Nm93gvuu9VUTg== Received: by mail-pg1-f197.google.com with SMTP id z10-20020a634c0a000000b0036c5eb39076so7168875pga.18 for ; Mon, 21 Mar 2022 04:44:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uawFGmD6DCODlzed6YMLY+prrSY/4uvDU6GsqrIpGCI=; b=FVLUa/P5vsJkW5F/3AwD7A5KhbLxGYcYMraXSeTmyYeunfJJWOJbgF/1i9s8lIgbHa 3pHl83zFTM+2cFgqJkGs3hhVNmq/JuYdIS/vajgEtihk6t3hS914yfZ/uCNcvG5UOxgq uGxNtGH0PBfXNncgskF7fNV+FjCnHLPq3Fe1QNFxMM4FVec4ZP9MLS9yg5Sy1RVNa5ny IWp/Irr2V43oI4ifRaC6JzaCrhXuJ07fifo4FiFMH7se0nBTO2YhuAJI3bU3/t+dNpoE Beg+K9mp2pFHyg79oOAQIFoek2IRdd5j0wt1foSaHU7obY+7PwDZlwuZS+owMCePOCYs KIPQ== X-Gm-Message-State: AOAM532Sw0SA+EMuWkak13s1jWSpLn96+0i3F2d7tX5aMJHF20+IZzc/ IG1B7bZMfW12q+dHXiq3ARBXA0abrPmh2JezDVfrex2PtIAYHW5AJKF5wQJ8OlrGJdAZu1mqPUJ FQRWL3onRGmpYqtiDhGbWhNhEsD5W29C/E+HY+NpG X-Received: by 2002:a05:6a02:193:b0:375:65a5:2fcd with SMTP id bj19-20020a056a02019300b0037565a52fcdmr17417569pgb.288.1647863064370; Mon, 21 Mar 2022 04:44:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJm1iFvLbWWzowb+/gkB9Bx6FZzMwN19YCnzuiYd3FqDttawI7GDlFmAREf04tNkyzk8nT4Q== X-Received: by 2002:a05:6a02:193:b0:375:65a5:2fcd with SMTP id bj19-20020a056a02019300b0037565a52fcdmr17417555pgb.288.1647863064000; Mon, 21 Mar 2022 04:44:24 -0700 (PDT) Received: from localhost.localdomain (2001-b011-2014-99fc-5753-e304-f0b2-b200.dynamic-ip6.hinet.net. [2001:b011:2014:99fc:5753:e304:f0b2:b200]) by smtp.gmail.com with ESMTPSA id h17-20020a63df51000000b0036b9776ae5bsm14366044pgj.85.2022.03.21.04.44.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 04:44:23 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [autotest-client-tests][PATCH] UBUNTU: SAUCE: ubuntu_fan_smoke_test: use resolvectl for parsing DNS server by default Date: Mon, 21 Mar 2022 19:43:28 +0800 Message-Id: <20220321114328.71526-1-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Some SUT will have more than one DNS server, example below is the output from node spitfire with Focal in Intel MAAS: Current DNS Server: 8.8.8.8 DNS Servers: 192.168.102.22 8.8.8.8 DNS Domain: maas In this case, this script will get 192.168.102.22 for systems that comes with systemd-resolve, but the test will fail with: Could not resolve 'security.ubuntu.com' Using the Current DNS Server instead can solve this issue. But this property does not exist before Focal. The solution is to use resolvectl by default and parse for "Current DNS Server", while still using the systemd-resolve to parse for "DNS Servers" in older release. Patch tested with X/B/F/I on bare-metal MAAS, F/J on Intel MAAS Signed-off-by: Po-Hsu Lin --- ubuntu_fan_smoke_test/smoke_test_old.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu_fan_smoke_test/smoke_test_old.sh b/ubuntu_fan_smoke_test/smoke_test_old.sh index 990a6804..8ad8ae54 100755 --- a/ubuntu_fan_smoke_test/smoke_test_old.sh +++ b/ubuntu_fan_smoke_test/smoke_test_old.sh @@ -142,16 +142,16 @@ fanatic_docker_test() dns_opt="" dns1=$(awk '$1=="nameserver"{print $2; exit}' /etc/resolv.conf) if [ "$dns1" = "127.0.0.53" ]; then - if command -v systemd-resolve 2>&1 > /dev/null; then + if command -v resolvectl 2>&1 > /dev/null; then + dns_opt="--dns=$(resolvectl status | + sed -n "0,/Current DNS/s/^.*Current DNS Server: //p")" + else dns_opt="--dns=$(systemd-resolve --status | awk '/DNS Servers:/{ sub(/.*DNS Servers: */, "") sub(/,.*/, "") print exit}')" - else - dns_opt="--dns=$(resolvectl status | - sed -n "0,/Current DNS/s/^.*Current DNS Server: //p")" fi echo -n "($dns_opt): " else