From nobody Tue Sep 03 07:08:20 2024 X-Original-To: dev-commits-src-branches@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 4WycCn2TDnz5MQgf; Tue, 03 Sep 2024 07:08:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WycCn0dcDz4TFn; Tue, 3 Sep 2024 07:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725347301; 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=n67YOxjhNm/KVrWJUbREEgOp6R7KNBVcyb+LK39Weu4=; b=A/W0v5CFmbBhJqc5pWWW9uCgJvJljNtTaKW+Rq2SdOQXxqaTUb0fjlA4InA5Vo25yF7Ed4 U2uOddlaezLhCy4JJ4bywuEnRe63OrTGJcyldfjnIgC5vUfCVl36NbxQyL9IH+d+LY6Nar 7VsZJNrs371rudaBKyrp/Y/nsqVEOeKfjl7NugomKLdH8FsD91GSqc1zGiBX0io3HNUTaP NS5Ha6cv6xesM4T1BE6yujVxi3I34j8DQ6EkpdnciMYoVm8cNtZtzPzGlf01Ftl0MFipus ftZJ10907HXbGvK9jw2tRVk/jserh1jcRmLrObA3F8x+L5GJI6Z8QQ7Nhj0Ugg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725347301; a=rsa-sha256; cv=none; b=obHRynlqNAB2XyCoM7PLHQ4QAKP31OCuVegW/rBY7IR+nvAw5ywGNnwW6fdZPC+PwOj0CZ M9K25ImBcdZuX7Uy4V1bQgv/HIir8N9Bvp8/9ObzwwQieZia9Bdaf1wa7LWF8zVplsjYJU +lmLlwesWtMR0l6BROfGOhry7Iv4Us5cEeq+rKOJHu40pPwgukcthQl7W+O5o2MzuQgThX v1uvrHoWrOdEOyXKQbVrMjI/Ux2UYQzVzejlMAP84Gf1Y7NPSu2O+FR6GYc4Y4SOV0UMbc BRwO8HTpkzba2hIWR2KMjGdY+hp4z1lWqlok0xtEnJvVeMzu058yI7zlU2iYIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725347301; 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=n67YOxjhNm/KVrWJUbREEgOp6R7KNBVcyb+LK39Weu4=; b=eqteJy3N/boN8LZ/8laxjWP9CBfRJqmrYvCO62/HefsEc9C8apTromoqI2BnLojabPlpmd LODpN7nvdCblCpnbX1lipdTO9HHKKIqx130asCrDNIMzOA+AQjMzfmjjT3kXDDuF7yzjUM oVmTO7eGg79fLhNmSEeHBDUWoeb7VKUyKXdAH0MN7qDUS04oIj36fB/XGUUyGuQAh6n2wd OJjC+g4/dfVd/wgKtZkeTV4PzvMfDWZByeacpZGOig339MYHcZI+HsFSFzBNBvAJMCuzva B4B56zoyZVYIYjOhOCHPFbh0iEqnXPTRoaS8FnJFk/SiStcCibkQfEUcOYqhRw== 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 4WycCn0BDFzX3J; Tue, 3 Sep 2024 07:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48378KuK069157; Tue, 3 Sep 2024 07:08:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48378KAR069154; Tue, 3 Sep 2024 07:08:20 GMT (envelope-from git) Date: Tue, 3 Sep 2024 07:08:20 GMT Message-Id: <202409030708.48378KAR069154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 5f7256579cd0 - stable/14 - nuageinit: Fix tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f7256579cd0b663e4a7013e81067d11b632fe10 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7256579cd0b663e4a7013e81067d11b632fe10 commit 5f7256579cd0b663e4a7013e81067d11b632fe10 Author: Jose Luis Duran AuthorDate: 2024-07-23 22:28:45 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-03 07:05:24 +0000 nuageinit: Fix tests Commit 07d17ca189fcf3cc44b7706040b05ca8135c3b85 set the recommended permissions for the SSH authorized keys file and directory. The tests, however, were failing on CI. Use stat to check for the proper permissions. Fixes: 07d17ca189f nuageinit: Set recommended SSH permissions Reported by: Jenkins (cherry picked from commit 8edd6c07c8dafcc5828bceb5fea0684c7d0d0775) --- libexec/nuageinit/tests/nuage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 531c171a3271..29842bff3d6b 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -17,8 +17,8 @@ addsshkey_body() { if [ ! -f .ssh/authorized_keys ]; then atf_fail "ssh key not added" fi - atf_check -o inline:".ssh: 040700 [drwx------ ] -> 040700 [drwx------ ]\n" chmod -vv 0700 .ssh - atf_check -o inline:".ssh/authorized_keys: 0100600 [-rw------- ] -> 0100600 [-rw------- ]\n" chmod -vv 0600 .ssh/authorized_keys + atf_check -o inline:"40700\n" stat -f %p .ssh + atf_check -o inline:"100600\n" stat -f %p .ssh/authorized_keys atf_check -o inline:"mykey\n" cat .ssh/authorized_keys atf_check /usr/libexec/flua $(atf_get_srcdir)/addsshkey.lua atf_check -o inline:"mykey\nmykey\n" cat .ssh/authorized_keys