From nobody Thu Jun 27 08:57:45 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 4W8ssQ1trMz5PGKC; Thu, 27 Jun 2024 08:57:46 +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 4W8ssQ08rmz4W7W; Thu, 27 Jun 2024 08:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478666; 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=MSWab7f0Z5wQfUCUCnGkNijwvuBzf4gCv/psiCk4eD0=; b=T3rgjxlR/hHlVbqaxnBDz4P/abtNCxYLZx2pBbNoW1lom5M8aEq/QqvXSmrC2dUxhD6eIa MkYiNb03FjjYOLdFmOp8JT4o/BR935UPX1QafiJiqvkPgXzKrhixc2lpU4iaM+WPe7t+GT BRvkFHOAnOlJ830D+pgkXxTAGU4YgA0b6vncBojXz9M6IbNULgAbNgZihXTRGBg6by6EUp JjNDr5rclLrE2C+Q8p4/V1hRRpnkWeYV0nf9dLls7PuXd3tvBwAqgG+7i0Ay+MluYpRjRd ASmrj0rtab8f363wap/7+pWM2wP9X+AwjU8nXTfpVc0a+ZmZdOW8rRCvjF00uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478666; a=rsa-sha256; cv=none; b=sOmBNTDwhAN+zoPC8brGJ3Sgi4yA0/xS+XMN35rub4truW7uIKdFllZBpxQZMsD6Ip068Y YheYLcoXAMEgmkKGutBwBTvQtj+6EFcDCN7IKgpg8ocZ++W3Iav6bwgs9hQEmQOsQpsfso o7Dnl9K/GS1y5KjBrqgm0C+cgHxl8TenQQqq6vWUK08bSbH8yKfS9Wg1NU63bkgMjuTDBz 1YXjWJ733ITBTfDe1Zzl9kUA3rkjP6ZsUlox1A8KVWfkPIqRrzV3l2HZ4colpXFXgs1gQI s9ka4RlEApwWfzN3z6XK/GS0LHwhpTSyt0SVIN6pZLLNQBnpmwtXl+fqJsk5dw== 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=1719478666; 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=MSWab7f0Z5wQfUCUCnGkNijwvuBzf4gCv/psiCk4eD0=; b=WUfvS1lbm8gyTqTqOz7T8/E9QmL1dexsxpsC1LF/XVak6tuoLhgNI7G6hhWKYpQsa9LKHk WUOgh7mwu20KzX+BHBhUoWB/LXIorbvsO0wdr8Cy27t63zdJrIGYTvow28f2ahnOBzO6Kv Mvs2679sjrgW5QyS+n2qhKFVPYd0nRXFaNNPX7BYtd4MR3wyCdYYAjq+jkYM29BX1Z1+5o qk6qxSunqjEGLoz4Dl2OcmYIecgnJVEVGfISCkKpMf6VDZWYf1hRF8yHRpBRRMoECRexTB hidjydjPPeMSesoC+1FG+UlBMsMcCRG/pl11cPlT4ECXfqFykxQPoxg0XgNMFA== 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 4W8ssP5tljz1LcV; Thu, 27 Jun 2024 08:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8vjuH010576; Thu, 27 Jun 2024 08:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8vjZQ010573; Thu, 27 Jun 2024 08:57:45 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:57:45 GMT Message-Id: <202406270857.45R8vjZQ010573@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: 30346359b377 - stable/14 - nuageinit: fix authorized_key test 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: 30346359b3775a958a7241e90982bf68fef667fc Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=30346359b3775a958a7241e90982bf68fef667fc commit 30346359b3775a958a7241e90982bf68fef667fc Author: Baptiste Daroussin AuthorDate: 2024-06-05 08:58:17 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:56:17 +0000 nuageinit: fix authorized_key test After miss reading the cloudinit spec I ended up writting a wrong test for basic ssh key setup, nuageinit has been fixed, but not the test, here is the actual fix. Reported by: markj (cherry picked from commit 8d7331e62a5aa75760ac54e3cb1594b0001645c6) --- libexec/nuageinit/tests/nuageinit.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 926233bcf66d..42c95e1b2abd 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -173,16 +173,17 @@ EOF config2_pubkeys_body() { here=$(pwd) + export NUAGE_FAKE_ROOTDIR=$(pwd) if [ $(id -u) -ne 0 ]; then atf_skip "root required" fi mkdir -p media/nuageinit - cat > media/nuageinit/meta_data.json << EOF -{ - "public_keys": { - "mykey": "ssh-rsa AAAAB3NzaC1y...== Generated by Nova" - }, -} + touch media/nuageinit/meta_data.json + cat > media/nuageinit/user-data << EOF +#cloud-config + +ssh_authorized_keys: + - "ssh-rsa AAAAB3NzaC1y...== Generated by Nova" EOF mkdir -p etc cat > etc/master.passwd <