From patchwork Tue Oct 15 11:34:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez via B4 Relay X-Patchwork-Id: 13836229 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8BB81E490B for ; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; cv=none; b=XySvHx+7yWiU1NClGZLnypw0G+l7b14YVY7uqx6ZkoI6SptdL/N1rXIjy51gxODoOOs54CnGjeD8lV3+dE7Zne9K+IOtRAOaPwhbQpwa+zCasYYzhffePLNauzMVqQ3siBe+xVe/dFItTFmbRwQl6cNHcnDhq9lUdoeS0iwkOZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; c=relaxed/simple; bh=U4UFcuHjeCeWQ2aPGHF2h8ju+lOHIcKPxednDLW90Ks=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fhZa1tVeJurOgTsqwjumconm0hBEb5jI7i1jCzSI4avty9B76zm2OyXd5PRGKaSA2ik9eAsqytjimiw7GB2rWvFzjZpixx0qCc2zivt8+/bgFVYgr4hX+Nlnyw7vc1Kvv6aglNH9pfVT1fAWOFFBpZmt/9LKqsR8ImIFwenYaBY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nHdNaWXc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nHdNaWXc" Received: by smtp.kernel.org (Postfix) with ESMTPS id 87D13C4CEC6; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728992110; bh=U4UFcuHjeCeWQ2aPGHF2h8ju+lOHIcKPxednDLW90Ks=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=nHdNaWXcyl0wlkzpcwVVVaUOMXWFPpUufQolfyhYDCqDpg3QaRfFyFtvSr9wtU1k0 yXoBc7oawFk72eHndrnd/LMq4ul2iVOJq4KZm+x+TztNhd8SX99bSmdyvGVIqbMM3Z gaubWuJlnfbDKnvjfE2SfWXxAQbxpFzlq0lkFeprHaygoNQsQ7kFbEn/Qcy5vvWPL3 KJouRhIMtHHQT3t+8MMSCFUDloGjMzj8i3toCBPlEvIAXjl9zOyzioZULfSV1UFcLh a6b4Z6ounsmfN+j/7ponM8YEbr3CZxy3Mpu2Vucd2jfJrIlN++B9n1KdyYHOTygj86 4t74jyBjUrSnA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77812CFC291; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) From: Daniel Gomez via B4 Relay Date: Tue, 15 Oct 2024 13:34:51 +0200 Subject: [PATCH 1/5] scripts: lib: rename KDEVOPS_WORKFLOW_FSTESTS Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241015-bringup-guestfs-debug-v1-1-bd74c0c31412@samsung.com> References: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> In-Reply-To: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> To: kdevops@lists.linux.dev, Luis Chamberlain Cc: "Daniel Gomez (Samsung)" , Daniel Gomez X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1728992109; l=976; i=da.gomez@samsung.com; s=20240621; h=from:subject:message-id; bh=agitDxiFrlhGQt6+adPfPU5KDudXEO2FENVxQ7uzWr8=; b=Q8aKuK61rd1dzqJEEStXfu7NcfeQvfWKTqzgYFF/CDZHRrLKFSScrxAcf5Id77bo9GnniWNNt nnL7ZWpV6DOB+AHwZ4g3nO8dXPzpi0+0WvydSLVdzve+EnrSoPUowDH X-Developer-Key: i=da.gomez@samsung.com; a=ed25519; pk=BqYk31UHkmv0WZShES6pIZcdmPPGay5LbzifAdZ2Ia4= X-Endpoint-Received: by B4 Relay for da.gomez@samsung.com/20240621 with auth_id=175 X-Original-From: Daniel Gomez Reply-To: da.gomez@samsung.com From: Daniel Gomez kdevops variable was renamed and this was silently failing. Make sure the proper workflow variable is checked but only if defined/set to avoid 'unbound variable' issue. Signed-off-by: Daniel Gomez --- scripts/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib.sh b/scripts/lib.sh index 041b7e279a0f9793bcb5ee797caa244ceeccdd01..56093b1a58ea1af104d9c0af2842b105783dbe80 100644 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -33,7 +33,7 @@ FSTESTS_STARTED_FILE="${TOPDIR}/workflows/fstests/.begin" BLKTESTS_STARTED_FILE="${TOPDIR}/workflows/blktests/.begin" REBOOT_LIMIT_STARTED_FILE="${TOPDIR}/workflows/demos/reboot-limit/.begin" -if [[ "$CONFIG_KDEVOPS_WORKFLOW_FSTESTS" == "y" ]]; then +if [[ "${CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS+x}" && "$CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS" == "y" ]]; then FSTYP="$CONFIG_FSTESTS_FSTYP" TEST_DEV="$CONFIG_FSTESTS_TEST_DEV" fi From patchwork Tue Oct 15 11:34:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez via B4 Relay X-Patchwork-Id: 13836227 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2C431E907D for ; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; cv=none; b=C2oqB/oWaTRy+9Vz30OSXFgznpRXVrOdvy9nDFEFXGYRUPZD3m+KM15wzvhCqZbDdN0wzBJX9UXW+5njenYXP8RWNU7ptKj2Mcg8Gb2nC9AbvBKliXSB8D6Fi/mOnasx/xTMMuEkrbIaJKQxX15U82PxmBne8FzwVypRJ+I7m88= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; c=relaxed/simple; bh=2I7WkedOlkWTZhE2utxlJW44kuWbM83H7G6oKC3BWKc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MKCmHtDD/xSwfZIQR8GDS4iCyEdPCBI7k/u39RMVxwspim6ZlPwSk+GMMQiqSoKrmYQO7Eh4AdcYAivODbEeR8FRLphLnE30LpSRL+dP34oprhWTtrLpHnj2yTRdV+53haFUTWyPm76r+RYBYeo0GivexojBbUccRnrOdAVGLeo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bKXYRCck; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bKXYRCck" Received: by smtp.kernel.org (Postfix) with ESMTPS id 8B9C0C4CED0; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728992110; bh=2I7WkedOlkWTZhE2utxlJW44kuWbM83H7G6oKC3BWKc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=bKXYRCckz55RMLoiiK5SVWK7qcPI7YtgyS7RZplCOjf0fpk6nf9Zcvbon+lPReDoe rkUBFGa4xkHvrznYQushlTQmvomZyuweAp8IzMBc8RtiKYgafrFpG9AdDTXNlqfKT5 czAiQzxpBIS3CwDeaHZselYMqvN4GSerHn1XdSS8FEv0w4/iqWd+BY9czgoipfQHn7 21ksdXhVIu016soj3aghgRIW072TE81T10yKDVOp49duZdFlN3Pgmz3gja6CBg8E1y kvjfvq7n/1VigvG+hcyjsYoo3/1kZBTp6Hzp1RXX05EKRfbl/lYlessHWVOqMlFIvh Q12vhuRosSujA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 860E6CFC293; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) From: Daniel Gomez via B4 Relay Date: Tue, 15 Oct 2024 13:34:52 +0200 Subject: [PATCH 2/5] guestfs: bringup: check if domain exists Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241015-bringup-guestfs-debug-v1-2-bd74c0c31412@samsung.com> References: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> In-Reply-To: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> To: kdevops@lists.linux.dev, Luis Chamberlain Cc: "Daniel Gomez (Samsung)" , Daniel Gomez X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1728992109; l=1281; i=da.gomez@samsung.com; s=20240621; h=from:subject:message-id; bh=r7n0kftrpxoYrS4NehqDL4UaHsnPJitiFNTCeq6FTxM=; b=vp9aLU0cSzArKTbTygFbVbXN1ysAAaVm49NQITltYeX2pbooDuHVIOfLu+aCcrizZahnfbZua ldM31EoLtx/Chhm7EPZLp+tI4YG471JehW3QkyCw3xWbS4NEM7MO09g X-Developer-Key: i=da.gomez@samsung.com; a=ed25519; pk=BqYk31UHkmv0WZShES6pIZcdmPPGay5LbzifAdZ2Ia4= X-Endpoint-Received: by B4 Relay for da.gomez@samsung.com/20240621 with auth_id=175 X-Original-From: Daniel Gomez Reply-To: da.gomez@samsung.com From: Daniel Gomez virsh domstate fails (exit 1) if domain checked does not exist. This conflicts when debugging the script with set -euxo pipefile. Replace the command with virsh list --all and search for the domain in the list. Also, capture the state to avoid trying to start a domain that is already running. Signed-off-by: Daniel Gomez --- scripts/bringup_guestfs.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index 32aadba0f4e5a0abc81d247f51cdddd0f2255785..5786975e48647321ecbc71ca9be6fb09c8aa63ff 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -334,10 +334,12 @@ do # If the guest is already defined, then just stop what we're doing # and plead to the developer to clean things up. # - virsh domstate $name 1>/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "Domain $name is already defined." - virsh start $name + if virsh list --all | grep --quiet --word-regexp "$name"; then + output_domstate=$(virsh domstate $name 2>/dev/null) + echo "Domain $name is already defined. (state: $output_domstate)" + if [ "$output_domstate" != "running" ]; then + virsh start $name + fi exit 0 fi From patchwork Tue Oct 15 11:34:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez via B4 Relay X-Patchwork-Id: 13836231 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA3E81EABC6 for ; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992111; cv=none; b=OlfmpXioehwtMz2lvdb6Bgf4Y7otPOB1ndslRfdP5RzITZeCzpQk1sEBxyrTWvSVkXBXs4slvgvVN2xedZ4ziQG9uXG6NEg/X6zfUAyWJ0qi5xYHdoCik7yqFejyDRVSTNGuZvdz9F8dDefHijuR+60FWifqQxyxN5jZFcdHhCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992111; c=relaxed/simple; bh=Hcn6dP383vkZPL63xHaVBCH2TgFTuSXdQgqEtIOd93g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V6fHJcv5zKGHceX0pQDF48fLbL3mQHSo9KfBBSiLmqu6Nv81SJmJekh6Gqe1PjdCcyZxdUANRIXrhqyEe3NMEUH+9YDG3mZ72cPnSW37YMlKhlMSUZQbxQI4OMY+8ql6Y40+3gdGh4qqkIlJtS4J+jAcBqKqjNLm2ufdj7AItnE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lX7E5b+o; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lX7E5b+o" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9D150C4CECF; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728992110; bh=Hcn6dP383vkZPL63xHaVBCH2TgFTuSXdQgqEtIOd93g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=lX7E5b+oBFSE/J7h0oqvNIZzoThZmgks0vi/rV7QHFQhkNIKCqPCGvHQRd3KfIdLK HvMVPORUCYHEMMGW8dSbF0O2REdK+ONflUnT9h1HLTzRwtTbp/Pvpb9T3XfNs7Juq5 oCjnReJSKKX1UA+kGWvcWYCmToasmlsg8ib+9ff0JZZbpbfCHMLeVsm5JrAQSRh2E1 Tm0hD8rSlu7Qrx+u0uuZKtfLqGG1dG6/JoDqLYbJRJVjBkeMiL2jOCcvJXw97t/CgV x+d0Mh7hoicxAtLssB/mkBq90zSQBbPeavk6hDkpDFfIspmLTJi4Zj+ZsES0F7C6eT yPzDjVKlrIQdA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93EF8CFC28F; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) From: Daniel Gomez via B4 Relay Date: Tue, 15 Oct 2024 13:34:53 +0200 Subject: [PATCH 3/5] guestfs: bringup: fix unbound variable when debug Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241015-bringup-guestfs-debug-v1-3-bd74c0c31412@samsung.com> References: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> In-Reply-To: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> To: kdevops@lists.linux.dev, Luis Chamberlain Cc: "Daniel Gomez (Samsung)" , Daniel Gomez X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1728992109; l=2993; i=da.gomez@samsung.com; s=20240621; h=from:subject:message-id; bh=mFkyyCRh3HwHjMp/IgHLJ4cqQP62CHIqv6gemSsgnE8=; b=Jt/kkJEI6ktLXMUtu1kKbL9M140AoCagJnhw3VfAVlHEtiL2SxIuNt5E0To1Ol6iDoUWfLcY8 1U59PJP/+2XDtAhD54ADhpDvO67zIckcSza95emHl4q/xeaLiSv9OQw X-Developer-Key: i=da.gomez@samsung.com; a=ed25519; pk=BqYk31UHkmv0WZShES6pIZcdmPPGay5LbzifAdZ2Ia4= X-Endpoint-Received: by B4 Relay for da.gomez@samsung.com/20240621 with auth_id=175 X-Original-From: Daniel Gomez Reply-To: da.gomez@samsung.com From: Daniel Gomez Fix unbound variable errors. This is a silent error only found while debugging. A variable may not be set, so check if set before comparing the value to avoid 'unbound variable' error. ++ mktemp + cmdfile=/tmp/tmp.cn0hNYMZbt + '[' '!' -f /var/lib/libvirt/images/kdevops/guestfs/base_images/debian-12.raw ']' .//scripts/bringup_guestfs.sh: line 289: CONFIG_GUESTFS_HAS_CUSTOM_RAW_IMAGE: unbound variable make: *** [scripts/guestfs.Makefile:77: bringup_guestfs] Error 1 Signed-off-by: Daniel Gomez --- scripts/bringup_guestfs.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index 5786975e48647321ecbc71ca9be6fb09c8aa63ff..19117e9a6ab55cfbe7c79f17e4a9b736edeb2607 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -242,7 +242,7 @@ _EOT # For the life of me I can't get the following line to work with # the virt-builder command and so we do a full edit of the file for now # edit /etc/nsswitch.conf:'s/\[!UNAVAIL=return\]//' - if [[ "$CONFIG_GUESTFS_DEBIAN_TRIXIE" == "y" ]]; then + if [[ "${CONFIG_GUESTFS_DEBIAN_TRIXIE+x}" && "$CONFIG_GUESTFS_DEBIAN_TRIXIE" == "y" ]]; then cat <<_EOT >>$cmdfile write /etc/nsswitch.conf: # kdevops generated /etc/nsswitch.conf append-line /etc/nsswitch.conf:passwd: files @@ -266,7 +266,7 @@ firstboot-command DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=tru firstboot-command systemctl stop ssh firstboot-command systemctl start ssh _EOT - if [[ "$CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST" == "y" ]]; then + if [[ "${CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST+x}" && "$CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST" == "y" ]]; then cat <<_EOT >>$cmdfile delete /etc/apt/sources.list.d/debian.sources _EOT @@ -292,7 +292,7 @@ fi cmdfile=$(mktemp) if [ ! -f $BASE_IMAGE ]; then - if [[ "$CONFIG_GUESTFS_HAS_CUSTOM_RAW_IMAGE" == "y" ]]; then + if [[ "${CONFIG_GUESTFS_HAS_CUSTOM_RAW_IMAGE+x}" && "$CONFIG_GUESTFS_HAS_CUSTOM_RAW_IMAGE" == "y" ]]; then build_custom_image fi @@ -305,7 +305,7 @@ if [ ! -f $BASE_IMAGE ]; then copy_yum_repo fi - if [[ "$CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST" == "y" ]]; then + if [[ "${CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST+x}" && "$CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST" == "y" ]]; then copy_host_sources fi @@ -360,7 +360,7 @@ do TZ="$(timedatectl show -p Timezone --value)" $USE_SUDO virt-sysprep -a $ROOTIMG --hostname $name --ssh-inject "kdevops:file:$SSH_KEY.pub" --timezone $TZ - if [[ "$CONFIG_LIBVIRT_ENABLE_LARGEIO" == "y" ]]; then + if [[ "${CONFIG_LIBVIRT_ENABLE_LARGEIO+x}" && "$CONFIG_LIBVIRT_ENABLE_LARGEIO" == "y" ]]; then lbs_idx=0 for i in $(seq 1 $(($CONFIG_QEMU_LARGEIO_MAX_POW_LIMIT+1))); do for x in $(seq 0 $CONFIG_QEMU_EXTRA_DRIVE_LARGEIO_NUM_DRIVES_PER_SPACE); do From patchwork Tue Oct 15 11:34:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Gomez via B4 Relay X-Patchwork-Id: 13836232 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A2DD1E907D for ; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992111; cv=none; b=gt3/WUiUdVFgtzQ4CdkPafYsjuUCOHG9YkNCtsibPKLKkAFJZeohSxFMmXPiSpeBdO0kb+JW418056k0Y7gw13c8tpAJt0ZwlEF1weEFGVEgMgj5FFwtnDZOkqJNyqP412XkgXnIT7xWH1fPV0wDbXp7WKCFlvRD98Vu0kYCNWM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992111; c=relaxed/simple; bh=lv/WiPJ6Ce5YmMfyhTVTNymhet1YlWoyOQNGAF9WXGs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W9fW8DMnGrEQNPlKI2gSyvRhVR1HCNPZmJZ+cGngTEu9OvsH0DIjpecM5B218r46GXaLtoyjih2LA+R3EfRyOEkqR/vci5AxeLTfKOhGPD93cfmh00mSPHlC72gJm436r/gWCSb+EC7gZMbQsYQxrZ2nUAZxfZfBPwgXOb7Ca5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VQsmPeck; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VQsmPeck" Received: by smtp.kernel.org (Postfix) with ESMTPS id AF4C5C4CED2; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728992110; bh=lv/WiPJ6Ce5YmMfyhTVTNymhet1YlWoyOQNGAF9WXGs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=VQsmPecks4hUCle3NL+EB9rJ4J3DPQmiV8rBg+oRpJDL3wgMbWQyaRM40sjpNhtvq o0PbM3Z2PqrmSbGOu6dM0V6yWiJ8dZHwJBtVCFJ673AdtN8pbtuBEXEvIC0oDmVZ2x IYWWt7G+ldhI+ORlauPfbqCHEmeE9VJU8c4rTMbFI8hiwjS1yRr4lt7x6omm/XQTtH xKGdm+PEbD+/aDGrDu9LZInjxCMug1msslJFiyPIQZEzst5PNGx3+dUK18+nYPlp5g ppVfw0vO5y6UqV0d9nwep1TxkL7qkIhly5mFd5klHPki7XoEXVK4usQ680nqnfMp7a 4wItr0qhi7pEQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3461CFC294; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) From: Daniel Gomez via B4 Relay Date: Tue, 15 Oct 2024 13:34:54 +0200 Subject: [PATCH 4/5] guestfs: bringup: fix user check when debug Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241015-bringup-guestfs-debug-v1-4-bd74c0c31412@samsung.com> References: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> In-Reply-To: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> To: kdevops@lists.linux.dev, Luis Chamberlain Cc: "Daniel Gomez (Samsung)" , Daniel Gomez X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1728992109; l=792; i=da.gomez@samsung.com; s=20240621; h=from:subject:message-id; bh=v9hvEPJijMSXr0qDwFBjQSGQk2G5W+FZoAA2dzyx9Og=; b=M6rDRkrLXvypRZjVY5Kfin5tW8SsT1PdsmSP4rg/OpIzsUVbnOkXPsv8RpNWURctgWLqWdiup +0uBi1fOk8hBmI7RVbGGJr5gtrEwlWnGhdkUKsGXmoElc45B2GmIoXO X-Developer-Key: i=da.gomez@samsung.com; a=ed25519; pk=BqYk31UHkmv0WZShES6pIZcdmPPGay5LbzifAdZ2Ia4= X-Endpoint-Received: by B4 Relay for da.gomez@samsung.com/20240621 with auth_id=175 X-Original-From: Daniel Gomez Reply-To: da.gomez@samsung.com From: Daniel Gomez Replace id -u with getent to check if the user exists. Avoids id: ‘kdevops’: no such user. Signed-off-by: Daniel Gomez --- scripts/bringup_guestfs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index 19117e9a6ab55cfbe7c79f17e4a9b736edeb2607..54d8d92dcf2ff5f1de2099cbff785866c9f1c27d 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -200,8 +200,7 @@ _EOT pre_install_customizations() { KDEVOPS_UID="" - id -u kdevops 2>&1 > /dev/null - if [ $? -eq 0 ]; then + if getent passwd kdevops > /dev/null 2>&1; then KDEVOPS_UID="-u `id -u kdevops`" fi if echo $OS_VERSION | grep -qE "^(rhel|fedora|centos)"; then From patchwork Tue Oct 15 11:34:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez via B4 Relay X-Patchwork-Id: 13836230 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD5541EABC3 for ; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; cv=none; b=qqabeFQOOGshg/D5r2BI7UsK9rYcIJ3n/oQJzWRMysmYr/R3NJi7v3FZ7l1NcnZhIzWiHR77bkbwWDImwPlwo7flA7IrRR8bsv6DHIwUFGizDjo/i5/k6zaPVzFPVri82FTiSPdYYi1PrEjbNOdO4nU9IA5YB80HGfd0xxbJ2eo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; c=relaxed/simple; bh=G+PJPhJoQaCVMhqXPvh5JF1gEBeQkx2MxWn2IlLIzjw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hsRx+qcKv5foD+T9fnJE93+8tERwAqDsg1UXI5BNT7cRUjobnE9l/5pA2SIyP+RrezmTiqWbnfBrTsFTi3FoaBwYTcIhD59QZwhktqnx6qPrgEDAcPEPA95Q/ZDlZVQxc79nMfIWaFclSzuV5F9Qw6j08b8hCURrrL2htHf/LkQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NxzLtha+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NxzLtha+" Received: by smtp.kernel.org (Postfix) with ESMTPS id BD918C4CED1; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728992110; bh=G+PJPhJoQaCVMhqXPvh5JF1gEBeQkx2MxWn2IlLIzjw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=NxzLtha+scne0H/cCtCFMsbEiAA5lQx6buD9/KRrpPkM0HWm4KON2JWdjEpvyLYFQ l72NNAKLyTsruFxwhiQWn2fwcJ+whN6z7HFOsI/DETYPZo6EpeqkpAGh5IE8Wnwe3H 9T+jrzAoT0aCir6/5jBtdzN24ge0Z8rgL7s6SAVLNr4GNVuPgHFyppXHLRNO64fICd qhUhvt/7NyGeCB3QAhMN0Lv1tw9xq5Za5p2ji+9Xeh5+O/iNWsPkSN07Zev+jZI7cj FF7+DYBaX3n4IshP9sgCev5lFnb1mjdLV3U8KEWS1iiWgkuTcM5myM+xk77YKygVy8 BfDd6ihYxsV/Q== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B429DCFC293; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) From: Daniel Gomez via B4 Relay Date: Tue, 15 Oct 2024 13:34:55 +0200 Subject: [PATCH 5/5] guestfs: bringup: add debug mode Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241015-bringup-guestfs-debug-v1-5-bd74c0c31412@samsung.com> References: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> In-Reply-To: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> To: kdevops@lists.linux.dev, Luis Chamberlain Cc: "Daniel Gomez (Samsung)" , Daniel Gomez X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1728992109; l=2391; i=da.gomez@samsung.com; s=20240621; h=from:subject:message-id; bh=WZwxchjtEQrknS8F+lFGpB+NBAHq3BDvOI2VdkRBVAE=; b=QHvmE+dvCaP2yQ2MZqSYtuPGIbPIOPpoXOe2bB108A7dX5DDyrUjUFqFbw4IPppXY4VXuMSlU dA+vpOhliagBjpukH/nTtVDJRFjPureyN/SNXV/PURIvXZlmTWFHlou X-Developer-Key: i=da.gomez@samsung.com; a=ed25519; pk=BqYk31UHkmv0WZShES6pIZcdmPPGay5LbzifAdZ2Ia4= X-Endpoint-Received: by B4 Relay for da.gomez@samsung.com/20240621 with auth_id=175 X-Original-From: Daniel Gomez Reply-To: da.gomez@samsung.com From: Daniel Gomez To be able to run bringup_guestfs.sh script in bash debug mode: 1. disabled 2. set -x 3. set -euxo pipefile From set manual: -x Print commands and their arguments as they are executed. -e Exit immediately if a command exits with a non-zero status. -u Treat unset variables as an error when substituting. -o option-name Set the variable corresponding to option-name: pipefail the return value of a pipeline is the status of the last command to exit with a non-zero status, or zero if no command exited with a non-zero status Signed-off-by: Daniel Gomez --- kconfigs/Kconfig.guestfs | 21 +++++++++++++++++++++ scripts/bringup_guestfs.sh | 8 ++++++++ 2 files changed, 29 insertions(+) diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index a804c8fce2fd48049bbd6a7954abff547e041a19..2ebd7987b66a0ebdf601eb30307e1296876957d3 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -203,4 +203,25 @@ config VIRT_BUILDER_OS_VERSION to get a list of operating systems and versions supported by guestfs. +choice + prompt "Guestfs bringup debug mode" + default GUESTFS_BRINGUP_DEBUG_DISABLED + +config GUESTFS_BRINGUP_DEBUG_DISABLED + bool "Disabled" + help + Disables bringup debug. + +config GUESTFS_BRINGUP_DEBUG_0 + bool "set -x" + help + Enables 'set -x' when running scripts/guestfs_bringup.sh. + +config GUESTFS_BRINGUP_DEBUG_1 + bool "set -euxo pipefile" + help + Enables 'set -euxo pipefile' when running scripts/guestfs_bringup.sh. + +endchoice + endif # GUESTFS diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index 54d8d92dcf2ff5f1de2099cbff785866c9f1c27d..eb506b9c1b7b2105f443ce0b4194dcfa9fb5a476 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -5,6 +5,14 @@ source ${TOPDIR}/.config source ${TOPDIR}/scripts/lib.sh +if [[ "${CONFIG_GUESTFS_BRINGUP_DEBUG_0+x}" && ${CONFIG_GUESTFS_BRINGUP_DEBUG_0} == "y" ]]; then + set -x +fi + +if [[ "${CONFIG_GUESTFS_BRINGUP_DEBUG_1+x}" && ${CONFIG_GUESTFS_BRINGUP_DEBUG_1} == "y" ]]; then + set -euxo pipefail +fi + export LIBVIRT_DEFAULT_URI=$CONFIG_LIBVIRT_URI # On systems using system sesion, ensure that we start the default