From patchwork Mon Mar 24 07:08:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4126 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 24 Mar 2025 08:08:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52O78Ab0021262 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 24 Mar 2025 08:08:10 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-43d0830c3f7sf31618515e9.2 for ; Mon, 24 Mar 2025 00:08:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1742800085; cv=pass; d=google.com; s=arc-20240605; b=KWBmrC4+/+v2iHjaU3tChD8akiiWASRTcCUdhspmPgJ6fVvCKOiN5G7h3N3lb8b51W VRklAWZ4YKhRGpiTdCNrZEie3BmYnxWaffVQA30Qm5fH83qpjDbJ3rRGOV86JjKVgc4X oOICY8K4zw0jkaU0/cJg/L+/vyfatkGgYX/l8VB9qYUkmqVk06XTy0MxVP56nfajwR2M GrE879BDWgu7HrXWUlbnpuNvnAv0go1AY5IOy4qhnFjWSFQsCcYCMq8Zw7nOxpbzeW9e KX3cVhfq8xdnD+crFd4IYi4cCjSaVRT2/IQ1CusnxC0h2sNutQOVNBHwA22iizgpQHDG LvxA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=C9Q6btxvxZrjQWNgyPurAm98aa2+3jKSUE9AGqmxoF8=; fh=+Y3EyVAxjoGD8SgJGhEieip9QboGFYeP5hc2wpC9CPA=; b=cl0e7ARcLehh+iON1QZChXcxzaOHCZ3DzKAlM/VVGkxsIoSwysi9aKVYGv89v5Qc0h 3g5rI8lcMMXuQPZMRwZu9cDJ+sJhPTI47kYXc4y2Zyk0fOHLm6wO6cV9PhcDaJXlTWg1 V5EjBgiPf2+dVSVA7tjA2+2CXMqCCFtqwuIF5Zk2lbIGKuRyOMNLUswJvMkiPRcNCGTd 9RTqDQDRI8412i6nBdIuQdLyIAzc0HNsg3pGI4+e/hc7FHqaIUqOrQkpFIK/eo3/KTkh 4m6KZOT5KWptdUDDGqYfgaXnfvY1vcnJDfw5SzmtfFkCOxYeE/Fx47YeBOMqYatSbrw0 VFAA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=HKnynwGR; spf=pass (google.com: domain of fm-1324425-2025032407075950649728dc7c434224-uhe7_z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-2025032407075950649728dc7c434224-uHE7_Z@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1742800085; x=1743404885; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=C9Q6btxvxZrjQWNgyPurAm98aa2+3jKSUE9AGqmxoF8=; b=umpp1tSWV4qQsfZvbe+SjsyKTXyYfkD56vog9KrU2f/MOfTfFy7JEyQusjsx+R8F3l lcah9/jLrZaeo+Ay0mvRGYJ7FeRMe1pq3Fjp1XQ6ADTyppeMXFRQ6cf0OCVBvG666Mtc vc/ihUW5QtUe2RCIuwVrRAg2fsLG3T7ClHEiUDzy1DpLFYNhALU6vPHlWgyMaj3Q6Z0Q plTtuBiNVkH2k0CwVaZEkx4wihJ+JUWAxUkbiYfRuhC4zHHLAf3KZwrmozPa2c2fRHIQ Zo6cpfwUeOe9Z+lijxUqj71+irt/mXJAhEQvsTpfrVLDlFlmM59SqvccfDO/yBQfa+6U chzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742800085; x=1743404885; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C9Q6btxvxZrjQWNgyPurAm98aa2+3jKSUE9AGqmxoF8=; b=Okm4z6S5sGYn/pnVTnaXhTuPdiA1Uc+DYEIgStY4O1aCyA63KhQYjOISGIpS9XBEv/ g5O57JcDPJMeK93rfNPUT8bSlMNUN/vw9mgmjv8YCvGYWAwi1Mhc6DBp3SE5OOpxwafz vvMhsNCSmd0zdkGpG3J3gLRes1pvAp9FAi7Y19O9SH3owTwwk5KPa6EhAjEib04uRQzq SUxXSGDxHR2Mp3NPnQy/BFw1Ppbp9OMVdFdlHvyPLtHSoJyPGdupROojG85pD1fKy6dO CSFBVuF8ha4Fr135bI6Rikd5MwoctLc9+Ll1put71HQT9yZGnLQTr9RO8iLqMIwuiRxH LtOQ== X-Forwarded-Encrypted: i=2; AJvYcCWd0s0pzTioOD1kHc/q8nXMdfoO4XfOaR8mg9rdObtZIN1iVahxfSP/Q7J6OHr42/tqMO7YAxc=@isar-build.org X-Gm-Message-State: AOJu0YzLsrNgDa/Scb07KAcUt7y4f4ge635HCifNh6CKXl/WxwtxlTzU 0hgBSvVramTjqCj69MFOBU1QBW15BT9mwkME855KsAu3/L7HQxlf X-Google-Smtp-Source: AGHT+IEagXrBrKSiNno2wC8nnQLZ7yHChv2du3O5AxnAboYUJZGfrphsTv1scsvWhGzpK+yEpg40zw== X-Received: by 2002:a05:600c:5491:b0:439:643a:c8d5 with SMTP id 5b1f17b1804b1-43d508728eamr92978505e9.0.1742800083681; Mon, 24 Mar 2025 00:08:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJSiOBTR8Aw9RtDb35AiVCtQUQAl6HvGyI6SvJxyXAwTw== Received: by 2002:a05:600c:468a:b0:43c:eb7b:1403 with SMTP id 5b1f17b1804b1-43d4ec8ca50ls20637095e9.1.-pod-prod-09-eu; Mon, 24 Mar 2025 00:08:00 -0700 (PDT) X-Received: by 2002:a05:6000:1a8d:b0:399:7f43:b3a4 with SMTP id ffacd0b85a97d-3997f90fdc5mr7781658f8f.24.1742800080400; Mon, 24 Mar 2025 00:08:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742800080; cv=none; d=google.com; s=arc-20240605; b=k6nSnUb36nIMWTOPEOrG6ZliI+Cw0hWpvtyJgPrLIhLD3SqUNRaPi5/HT5LYecscho NTUcU1x365zUkKkOzk2CrwsaaH0sslC7vZ6OV+vz032mP961Q5MkrL5V7x6n0pmpphSO JClrU1/EToMW6n1lSKiRt/xrzXbS+0hIlTy3zGmxSSXdpIGuje0/LbQun6C++qnPRYao LLiSpBItiI+aAK6z22uF87/FSDFuqcQpX1oYFDWWi4ANvydoQgz30eX6T8QmgJm0svqn 5JUn76xBSUmBwbFzFvcH4quJ039wcCq2LNMV25FCoNCYxaVExtA3wedzSfmfUmGsAXBU Veiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=weBn8vROSQLh7FmaJm5Eo5B1lo4PG74GunE2Bf+L4z8=; fh=xn6duDNmfWhT4wMQ9vfjynwp0yXXw9CW97AC2kimJN0=; b=ifhhQw1us0PZnzrBjtAjUQ6cH7xAUv6BcFhXgZe+qTqMxERz/4yalUj3u78Qm3t7E9 A1hgRe4SBtLTHytZP7KeRsKJsyoJx3YvRZUnxbE8XIU5xolDvS43FGMFO4YNJavxQF1C xoEw8q13Sn4H+nYoK8t/+9+IDTh7e4kD3iSs3AMDtJ4aSy27O8pEvrZL8KWiLr3Bi/Az TuqNIaba7xeUttAsrqVat3M0dhbiUGXkP5oLCyunG8MF9zXdDiMW24EC1Jt60poVcYIn X1dskLx4ugm/YWeYyoN/Pk52qRg0YcFwpAsBifbbmSKvwijB9PsFjTw7fQcVGeWT/Ovr 256A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=HKnynwGR; spf=pass (google.com: domain of fm-1324425-2025032407075950649728dc7c434224-uhe7_z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-2025032407075950649728dc7c434224-uHE7_Z@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-3997f97db50si145790f8f.2.2025.03.24.00.08.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Mar 2025 00:08:00 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-2025032407075950649728dc7c434224-uhe7_z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2025032407075950649728dc7c434224 for ; Mon, 24 Mar 2025 08:08:00 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: ubely@ilbers.de, Srinuvasan A Subject: [PATCH 1/2] kas/kas-container: update kas-container to version 4.7 Date: Mon, 24 Mar 2025 12:38:32 +0530 Message-Id: <20250324070833.2280190-1-srinuvasan.a@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=HKnynwGR; spf=pass (google.com: domain of fm-1324425-2025032407075950649728dc7c434224-uhe7_z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-2025032407075950649728dc7c434224-uHE7_Z@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Srinuvasan A Signed-off-by: Srinuvasan A --- kas/kas-container | 99 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 78 insertions(+), 21 deletions(-) diff --git a/kas/kas-container b/kas/kas-container index 6b2131c3..d6118b97 100755 --- a/kas/kas-container +++ b/kas/kas-container @@ -27,24 +27,28 @@ set -e -KAS_IMAGE_VERSION_DEFAULT="4.5" +KAS_IMAGE_VERSION_DEFAULT="4.7" KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas" KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas" KAS_CONTAINER_SELF_NAME="$(basename "$0")" +# usage [exit_code] usage() { + EXIT_CODE="$1" SELF="${KAS_CONTAINER_SELF_NAME}" + printf "%b" "Usage: ${SELF} [OPTIONS] { build | shell } [KASOPTIONS] [KASFILE]\n" - printf "%b" " ${SELF} [OPTIONS] { checkout | dump } [KASOPTIONS] [KASFILE]\n" + printf "%b" " ${SELF} [OPTIONS] { checkout | dump | lock } [KASOPTIONS] [KASFILE]\n" printf "%b" " ${SELF} [OPTIONS] for-all-repos [KASOPTIONS] [KASFILE] COMMAND\n" - printf "%b" " ${SELF} [OPTIONS] { clean | cleansstate | cleanall} [KASFILE]\n" + printf "%b" " ${SELF} [OPTIONS] { clean | cleansstate | cleanall } [KASFILE]\n" printf "%b" " ${SELF} [OPTIONS] menu [KCONFIG]\n" printf "%b" "\nPositional arguments:\n" printf "%b" "build\t\t\tCheck out repositories and build target.\n" printf "%b" "checkout\t\tCheck out repositories but do not build.\n" printf "%b" "dump\t\t\tCheck out repositories and write flat version\n" printf "%b" " \t\t\tof config to stdout.\n" + printf "%b" "lock\t\t\tCreate and update kas project lockfiles\n" printf "%b" "shell\t\t\tRun a shell in the build environment.\n" printf "%b" "for-all-repos\t\tRun specified command in each repository.\n" printf "%b" "clean\t\t\tClean build artifacts, keep sstate cache and " \ @@ -63,9 +67,7 @@ usage() printf "%b" "--runtime-args\t\tAdditional arguments to pass to the " \ "container runtime\n" printf "%b" "\t\t\tfor running the build.\n" - printf "%b" "-d\t\t\tPrint debug output (deprecated, use -l debug).\n" printf "%b" "-l, --log-level\t\tSet log level (default=info).\n" - printf "%b" "-v\t\t\tSame as -d (deprecated).\n" printf "%b" "--version\t\tprint program version.\n" printf "%b" "--ssh-dir\t\tDirectory containing SSH configurations.\n" printf "%b" "\t\t\tAvoid \$HOME/.ssh unless you fully trust the " \ @@ -80,28 +82,39 @@ usage() "\t\t\t(default for build command)\n" printf "%b" "--repo-rw\t\tMount current repository writeable\n" \ "\t\t\t(default for shell command)\n" + printf "%b" "-h, --help\t\tShow this help message and exit.\n" printf "%b" "\n" printf "%b" "You can force the use of podman over docker using " \ "KAS_CONTAINER_ENGINE=podman.\n" - exit 1 + + exit "${EXIT_CODE:-1}" } -fatal_error(){ +fatal_error() +{ echo "${KAS_CONTAINER_SELF_NAME}: Error: $*" >&2 exit 1 } -warning(){ +warning() +{ echo "${KAS_CONTAINER_SELF_NAME}: Warning: $*" >&2 } +debug(){ + if [ -n "${KAS_VERBOSE}" ]; then + echo "${KAS_CONTAINER_SELF_NAME}: Debug: $*" >&2 + fi +} + trace() { [ -n "${KAS_VERBOSE}" ] && echo "+ $*" >&2 "$@" } -enable_isar_mode() { +enable_isar_mode() +{ if [ -n "${ISAR_MODE}" ]; then return fi @@ -118,7 +131,8 @@ enable_isar_mode() { fi } -enable_oe_mode() { +enable_oe_mode() +{ if [ "${KAS_CONTAINER_ENGINE}" = "podman" ]; then # The container entry point expects that the current userid # calling "podman run" has a 1:1 mapping @@ -126,7 +140,23 @@ enable_oe_mode() { fi } -run_clean() { +enable_unpriv_userns_docker() +{ + if [ -f /etc/os-release ] && grep -q 'NAME="Ubuntu"' /etc/os-release && + [ -f /proc/sys/kernel/apparmor_restrict_unprivileged_userns ] && + [ "$(cat /proc/sys/kernel/apparmor_restrict_unprivileged_userns)" = "1" ]; then + if [ -f /etc/apparmor.d/rootlesskit ]; then + debug "AppArmor restricts unprivileged userns, using \"rootlesskit\" profile" + KAS_RUNTIME_ARGS="${KAS_RUNTIME_ARGS} --security-opt apparmor=rootlesskit" + else + warning "AppArmor restricts unprivileged userns but no suitable apparmor " \ + "profile found. Consider setting apparmor_restrict_unprivileged_userns=0" + fi + fi +} + +run_clean() +{ if [ -n "${KAS_ISAR_ARGS}" ]; then # SC2086: Double quote to prevent globbing and word splitting. # shellcheck disable=2086 @@ -149,7 +179,17 @@ run_clean() { fi } -set_container_image_var() { +KAS_GIT_OVERLAY_FILE="" +kas_container_cleanup() +{ + if [ -f "${KAS_GIT_OVERLAY_FILE}" ]; then + trace rm -f "${KAS_GIT_OVERLAY_FILE}" + fi +} +trap kas_container_cleanup EXIT INT TERM + +set_container_image_var() +{ KAS_IMAGE_VERSION="${KAS_IMAGE_VERSION:-${KAS_IMAGE_VERSION_DEFAULT}}" KAS_CONTAINER_IMAGE_NAME="${KAS_CONTAINER_IMAGE_NAME:-${KAS_CONTAINER_IMAGE_NAME_DEFAULT}}" KAS_CONTAINER_IMAGE_PATH="${KAS_CONTAINER_IMAGE_PATH:-${KAS_CONTAINER_IMAGE_PATH_DEFAULT}}" @@ -158,8 +198,10 @@ set_container_image_var() { } KAS_WORK_DIR=$(readlink -fv "${KAS_WORK_DIR:-$(pwd)}") -# KAS_WORK_DIR needs to exist for the subsequent code -trace mkdir -p "${KAS_WORK_DIR}" +if ! [ -d "${KAS_WORK_DIR}" ]; then + fatal_error "KAS_WORK_DIR '${KAS_WORK_DIR}' is not a directory" +fi + KAS_BUILD_DIR=$(readlink -fv "${KAS_BUILD_DIR:-${KAS_WORK_DIR}/build}") trace mkdir -p "${KAS_BUILD_DIR}" @@ -192,6 +234,7 @@ KAS_RUNTIME_ARGS="--log-driver=none --user=root" case "${KAS_CONTAINER_ENGINE}" in docker) KAS_CONTAINER_COMMAND="docker" + enable_unpriv_userns_docker ;; podman) KAS_CONTAINER_COMMAND="podman" @@ -269,11 +312,6 @@ while [ $# -gt 0 ]; do KAS_REPO_MOUNT_OPT="rw" shift 1 ;; - -v | -d) - KAS_VERBOSE=1 - KAS_OPTIONS_DIRECT="${KAS_OPTIONS_DIRECT} -d" - shift 1 - ;; -l | --log-level) if [ "$2" = "debug" ]; then KAS_VERBOSE=1 @@ -285,6 +323,9 @@ while [ $# -gt 0 ]; do echo "${KAS_CONTAINER_SELF_NAME} $KAS_IMAGE_VERSION_DEFAULT" exit 0 ;; + -h | --help) + usage 0 + ;; --*) usage ;; @@ -293,7 +334,7 @@ while [ $# -gt 0 ]; do shift 1 break ;; - shell) + shell|lock) KAS_REPO_MOUNT_OPT_DEFAULT="rw" KAS_CMD=$1 shift 1 @@ -459,6 +500,22 @@ set -- "$@" -v "${KAS_REPO_DIR}:/repo:${KAS_REPO_MOUNT_OPT}" \ -e KAS_BUILD_DIR=/build \ -e USER_ID="$(id -u)" -e GROUP_ID="$(id -g)" --rm --init +if git_com_dir=$(git -C "${KAS_REPO_DIR}" rev-parse --git-common-dir 2>/dev/null) \ + && [ "$git_com_dir" != "$(git -C "${KAS_REPO_DIR}" rev-parse --git-dir)" ]; then + # If (it's a git repo) and the common dir isn't the git-dir, it is shared worktree and + # we have to mount the common dir in the container to make git work + # The mount path inside the container is different from the host path. Hence, we over-mount + # the .git file to point to the correct path. + KAS_GIT_OVERLAY_FILE=$(mktemp) + sed "s|gitdir: ${git_com_dir}/|gitdir: /repo-common/|" "${KAS_REPO_DIR}/.git" > "${KAS_GIT_OVERLAY_FILE}" + set -- "$@" -v "${git_com_dir}:/repo-common:${KAS_REPO_MOUNT_OPT}" \ + -v "${KAS_GIT_OVERLAY_FILE}:/repo/.git:ro" + # if the workdir is the same as the repo dir, it is the same shared worktree + if [ "${KAS_WORK_DIR}" = "${KAS_REPO_DIR}" ]; then + set -- "$@" -v "${KAS_GIT_OVERLAY_FILE}:/work/.git:ro" + fi +fi + if [ -n "${KAS_SSH_DIR}" ] ; then if [ ! -d "${KAS_SSH_DIR}" ]; then fatal_error "passed KAS_SSH_DIR '${KAS_SSH_DIR}' is not a directory" @@ -484,7 +541,7 @@ if [ -n "${KAS_AWS_DIR}" ] ; then fi if [ -n "${AWS_WEB_IDENTITY_TOKEN_FILE}" ] ; then if [ ! -f "${AWS_WEB_IDENTITY_TOKEN_FILE}" ]; then - echo "Passed AWS_WEB_IDENTITY_TOKEN_FILE '${AWS_WEB_IDENTITY_TOKEN_FILE}' is not a directory" + echo "Passed AWS_WEB_IDENTITY_TOKEN_FILE '${AWS_WEB_IDENTITY_TOKEN_FILE}' is not a file" exit 1 fi set -- "$@" -v "$(readlink -fv "${AWS_WEB_IDENTITY_TOKEN_FILE}")":/var/kas/userdata/.aws/web_identity_token:ro \ From patchwork Mon Mar 24 07:08:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4127 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 24 Mar 2025 08:08:12 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52O78B7T021263 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 24 Mar 2025 08:08:11 +0100 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-43d01024089sf28740025e9.1 for ; Mon, 24 Mar 2025 00:08:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1742800086; cv=pass; d=google.com; s=arc-20240605; b=hUxecDIgrWgddeckIkbgFlR1mqWEbyvgDVnbEFJsOlb3gJ4Pm6FpZjAgFG0bAwe5Bk Rc8EbG2B+TPUlZH9R9KYunJhgobyHxRAuebgGJsAdhmjgenh3+DV45qf0hUAaOoMg1Do +Bvtpz3ji21wP72YCS+Dc+lAnpxLk8TA4y8HDGYN7ZNxBMhfruTgkVBDoBnEqgSqbMyE to5GsEHGm1Y+w+hao9NADWPeGAPyqkHkF286swtX3R9JN3lknR9T7JAj9fwhsKeS+ZuK sWuJ9MN5fCSi4T7JgtP/OfNaUGg1XN7l28JEtvy8bC94Ks8FyymDDIt1ZK5rrL0j1zCq xfcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WC+yoy73cTz9WUB9feK21dkn3uh5Nfs2vtXv1Fs4jFA=; fh=ZglbPfiotvVtZ8aH68aQL8QZI0GYWScTCA6Yexh0DvM=; b=RJC2nqfNe3RYenvlbTCVAY8iCvwlN0K0vs0tlPPmJGHfY7Dcm8q/fijCW5bBXEdKng Y50ZGVpu8bSnX0TrU6OR2LSIDG0Hss2Y26/2DZA26cY1qLhuquHbiXk1vNkdBjDGaCIy sNfgP9cH5UTTA9J9kDs4CeFFuKf/qGnR3EcTCE87H3cVpGvSvWC6Re9q7DLBIgC9ixKW EQwL/sDxXDGs20LU+Hehu7e7kZ8ek9ivg/M/S8J1XIUtqW/83iW3C8HhPz3x1D64fRZ7 6lfpjm4ZcJKxOrReQ0GzYe1z6rSfOZDbcWfgae/WZDXpdh8qkUtROl2cfxf/V3Jf7ZkI HFDQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=SJSVDK0O; spf=pass (google.com: domain of fm-1324425-20250324070802d7a66567c5b78fc23f-0aj1rv@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-20250324070802d7a66567c5b78fc23f-0aj1rv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1742800086; x=1743404886; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WC+yoy73cTz9WUB9feK21dkn3uh5Nfs2vtXv1Fs4jFA=; b=hoTDAo5TLoa7VSa3Tlc+z0kVTP8PqFfzHO112Z3guH5eTJqc7h6btJjPw6ULO1lmtd IgipTX7kG5/8+Dz9tKn5ppu2qx10uxWyMie2xA29uRrOvMTAOWeSPec+zZLewGSJYbRJ Jm/LEbrWu+QKCvipeVM8f3lQtbQEJwj7CEa4SpFTpE9mDkx0AEWgSluQD7hxKrdxi+f3 /zbt7ozEhc2eh0Hx84TAO7uYF0tJz4rJFEFz+SaM/bhgOYPJ9Rxm4VfPnLfMafAodquu D6Z2022R1vU4zNGisMHmD4ImQxQ86VVMSztJs8oTRr0ewO2sQxufjkjLftDDYtwfWawU imrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742800086; x=1743404886; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WC+yoy73cTz9WUB9feK21dkn3uh5Nfs2vtXv1Fs4jFA=; b=MscxYvwKRTNznKoLuh+CB38ehrSopIBlW6INXnBVAT3Ck408sMisUakyUeLK6EaXT1 SfTvPndK7eP/SzFtIaXZWSpwbwa5V1Fd+ciBo3e/xvKHe9XC93V8dN36WNUF91xbv9a8 Id66YXQOnBPjLZ0RIleD/9yF0RBD4RvAGDNRr9SUjAg5Myu0h1ah8scvTKYxPVoDvb5I PRSx8h9q5cDjvyXH/GkwGm2hFcDl0dVCs1MRs7jK1vtW5skXUQ0sDjOvSev9WAKbAJAh YUt89ujA8qM0SxioWBe9coDB+HAwF62y3Ul4envsmXCtjjvC7/aA34BRv5lAeYdz6dpF bZ1g== X-Forwarded-Encrypted: i=2; AJvYcCVzE8ZIe0N7EM8xFLacbOT3TTbH+qr1ovDt+nsawPIUD2DvHKSw+5+s7Hp+/75jyqDF+KW8WBc=@isar-build.org X-Gm-Message-State: AOJu0YxljskGzQZodlU9xbdZYrcFOCHaPSU9KFqK4LzraEAOKlLAV5f3 0+vJsxoP/mMUXp94jCtxcP7UwEXIaLNPA1GAwxwat9zmLPen9pmx X-Google-Smtp-Source: AGHT+IHEsX9Y1Ns7lwYs0YM5R97q+1EbTWgj5e3zstk9e7RD6R1THeRcpCNJFtYWBFHBT1y4cojaww== X-Received: by 2002:a5d:64e7:0:b0:391:3f4f:a172 with SMTP id ffacd0b85a97d-3997f940e3fmr8202483f8f.49.1742800084765; Mon, 24 Mar 2025 00:08:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJfvPUS2hVS7k69FQ7rCzNdt2CMdOSOvDSypE+1sdivRA== Received: by 2002:a05:6000:4b:b0:390:dfa1:344b with SMTP id ffacd0b85a97d-399796f671bls598184f8f.1.-pod-prod-05-eu; Mon, 24 Mar 2025 00:08:02 -0700 (PDT) X-Received: by 2002:a05:6000:188d:b0:391:3124:f287 with SMTP id ffacd0b85a97d-3997f9014a6mr12104170f8f.16.1742800082497; Mon, 24 Mar 2025 00:08:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742800082; cv=none; d=google.com; s=arc-20240605; b=L0nWJ4DVb//EJii9dbvOZn20M+OW9rPJSu36mKf0OTAvyzhB1q6VUhgONMbs89LupF LI9yTEsCDJGJpC8ZZpDxs4jrqiq8wFy//Bx7Fm6yA9KAsJjUpwY/h2CwKN1BHMhNXHWL 39lCJIPLaE5WF7QGR6N12GDRgfafK0tqH86TY1LcLUmlroVUYTcMHQR3N0aFZ4mcQwaE 86lktZ2l0/sqCQj+8i0fthvULoIsTy6adZZtp9GDQy0E7dy2M3hzckBrIt8MuTlgmrDh W7ghDwEcBFvCMrqel3RxQ1J5jLqBrDyE8FRN2GVtoFnIyHpqZM8WoHyub9079NRZCTgT np4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=5SOjmCQSsdF61T6NVRlsVOv/LlLgng8WRrYHuT0nxoE=; fh=xn6duDNmfWhT4wMQ9vfjynwp0yXXw9CW97AC2kimJN0=; b=Rki2L2MUQSMS4RbzqCaxJQoNJryRvpizABZou6IVErbZ8056nOUexcpmY+LJeYtSJD R2OLBC0GT5RchQBgBAEAmYO0jKfS1zUiuy6wsi1R4hUArG7JVMJ+qI6b/m06JBc77Pdw Ln1tHPZ7obRNvN6hc9jpsKA4VVAiujGqzWhS4lgoIufiCkQy8jvmL+soYnceIUxY8Udn z0Tayx5JvtMFHfYICTJOnGCHwxW1dT/Ry+tizWAW5gV/baUULP+ahLpHCs31BGRlunfA 3qLyvCRWMm4+EN+Wy2oAsO9riRx9jdwGS6SEiqhAi5Rmjx1M15QftjPA4RsX4/dcv21S aTKw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=SJSVDK0O; spf=pass (google.com: domain of fm-1324425-20250324070802d7a66567c5b78fc23f-0aj1rv@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-20250324070802d7a66567c5b78fc23f-0aj1rv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-3997f97db50si145790f8f.2.2025.03.24.00.08.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Mar 2025 00:08:02 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-20250324070802d7a66567c5b78fc23f-0aj1rv@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20250324070802d7a66567c5b78fc23f for ; Mon, 24 Mar 2025 08:08:02 +0100 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: ubely@ilbers.de, Srinuvasan A Subject: [PATCH 2/2] meta-isar/test: update refspec to commit/branch Date: Mon, 24 Mar 2025 12:38:33 +0530 Message-Id: <20250324070833.2280190-2-srinuvasan.a@siemens.com> In-Reply-To: <20250324070833.2280190-1-srinuvasan.a@siemens.com> References: <20250324070833.2280190-1-srinuvasan.a@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=SJSVDK0O; spf=pass (google.com: domain of fm-1324425-20250324070802d7a66567c5b78fc23f-0aj1rv@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1324425-20250324070802d7a66567c5b78fc23f-0aj1rv@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Srinuvasan A kas-container 3.3 or above version not support refspec key instead it uses the commit/branch, hence dropping the refspec. Signed-off-by: Srinuvasan A Acked-by: Felix Moessbauer --- CONTRIBUTING.md | 4 ++-- meta-isar/test/sample_kas_config.yml | 4 ++-- meta-isar/test/sample_kas_config_hw.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f932417b..e70e36c9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -83,12 +83,12 @@ Plan merges to `master` so that both fit the two-week window; short extensions s git clone https://github.com/siemens/kas cat > kas.yml <