From patchwork Fri Feb 21 15:48:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4065 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Feb 2025 16:49:01 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f190.google.com (mail-lj1-f190.google.com [209.85.208.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 51LFn0jW015904 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Feb 2025 16:49:01 +0100 Received: by mail-lj1-f190.google.com with SMTP id 38308e7fff4ca-30a45ae93d8sf18198971fa.0 for ; Fri, 21 Feb 2025 07:49:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740152935; cv=pass; d=google.com; s=arc-20240605; b=dtyTL7M4EvHoGT/9iFVAXBQhiIPuA9EM/HR1ZGgjQzZJbjkc66ZzSlpT8MjenrMW75 D0eOef6qC1B4gWoHvEvR7AudyyfyqHyZsfcbSYB55iLnB64JODFO119V5j4cM8Ij8Guk cJqk1pmqElmOsJOP8Ag5MNMQrMzJe2+IroVT5xpJa2uEhCMR20rymXbL0ORNDsl3ijnK EjOrM9DFmzadIqlreyubIdAEp7uZZZUfsZcr9YTHx3qQsgfuwNg0mFzLHO+QoXe5j5rE 7d1jznnd2yICNXJxVoGWrz1GJumcrNKBQja7bTdL5nQzUcD6D4cGcGjg5SVwkRX+Bcjx cpVA== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=zBob7OIIdbeYBv3D3WRpcevc8oOoejQNIec5IYABtqQ=; fh=NNcOYM24cQKAIVKz7P8AKPtLvOy6WTZE+paJYUSYaO8=; b=h2kvttS0vNwEk+1Z59NTo63zr7E6y+SzkGZC7HDXPYbiMuiVnValsqaD/Ii4wWDq1p ymmgmViOC0U6U0I1rQC+wPAbnSwtfDf1ctTWCe76IjKe03JzC7A61clvbQ/tgnZ1IGnF S7Oi/I2e9ryP+fzIDmJyesBpr26wR9/rVWRo+KYFKtwu4NYem2hyMkWT0w/Obv9AuIxx gcXPlC8Z0d84xrHbfyvebBWhz0bpqpWKT0pFOlHLqX6W7vgJu15nIlKQqXTF4NtrYMTV 9R6ekMgAIsZFJSyKqXngblIn4qJ0uVyjcoILE61VX7u8EbAWOXRrEcu6sRmVv9KgFY6N wwUg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1740152935; x=1740757735; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=zBob7OIIdbeYBv3D3WRpcevc8oOoejQNIec5IYABtqQ=; b=UfaAq2g6Smlxm7OUAoHx+p5kp1nOyTQuMKwCQK2FxjTEPm80pnTu4X7tu8OwCVQDm0 48qggpBw95N+nWwXH98nVL28IZ6U4vIhmKY2JMGIRnMSlB+L6UgnD7mcB0NmVKzUOqBv J+YJsmssHrzJhc9uOwLa9mrGu8f7t+NwF0lu3vNFC5I9zIvc0pUl28/xXosjrNIjJNKq 0N/V6F3NDnSloiaZ0BWwdKwNHFJaZpOdJ2yTTBWXx37zi2uccOlN5OekOkeXxBUKV9PE h5kQj1dhEkS8a+fGM/zuvX0DuUjXKR+8YiyQDDyF8J+/9ClgpMk7U8lr1d1bAu+y3tp5 Jv4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740152935; x=1740757735; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=zBob7OIIdbeYBv3D3WRpcevc8oOoejQNIec5IYABtqQ=; b=Eoxaqa5IvjLjfV1v59NHo/8xuVsWwMlBMd4VNrC8c3xdqUXR7SQXrXDl0tPTiTeiUw jnMQ098k6YqBNDmzBHHYY+m1jUvhzwDc4BY1bXJmxj0gDsj//4Sn7Thgi1yALcw2lUWZ OzEOmXJCit63WDgaVoFfIEVByi0aFLSX13/94Cm4gnkJ1cfZPFzKQ1+IBe1e6lGoWUMW bVpHGzXM9qzTJvK1alLjRMSD+7fxEFu0r0sN4t/6BQpKE/cPZUkj0y/yG1zq32IlgtqL YfcPGUyZ1PBnQUBnSXzLdqj1qnXK6loeFNJfiFZ/HVvzNT+IIBTL6NdRm51WT8j6dJ4s QDQg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVQAYgeIN4bLsqFfud7/j9jmgCX6Lvoc7utqCLyDoAUjtFRCmoMHFilwmc88N7SfasOqs0DgOs=@isar-build.org X-Gm-Message-State: AOJu0YybMuC6URv4A0gQRv7KVpAIMUCR7Lo1ih4x6GC+hPIwTHa2XKIS /+AFdrw4+WNy/kS1WDk9ese87s3dy0pwEGCxzWkluxg5IvpVWeCl X-Google-Smtp-Source: AGHT+IGiWZedE0pbgvDVMhGAeUzg/aIt4O2Pa39/Z8LbZKN+dd+3s1tuFUpaRTtaQYAkOOQWlnNQ0g== X-Received: by 2002:a2e:9050:0:b0:308:eabd:299b with SMTP id 38308e7fff4ca-30a5b167c6fmr10205001fa.7.1740152934865; Fri, 21 Feb 2025 07:48:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVE4fE9Ge7AG5gxX9VM/AZ3JDeW9gekd44X3eUGco7awew== Received: by 2002:a2e:be90:0:b0:30a:3024:5bce with SMTP id 38308e7fff4ca-30a597c8708ls367921fa.0.-pod-prod-02-eu; Fri, 21 Feb 2025 07:48:52 -0800 (PST) X-Received: by 2002:a2e:95c4:0:b0:302:175e:5abb with SMTP id 38308e7fff4ca-30a5b167c85mr8903011fa.3.1740152932451; Fri, 21 Feb 2025 07:48:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740152932; cv=none; d=google.com; s=arc-20240605; b=N0S79TxukBubcZiCG9+gMOnc5s78p8CFrt3yWjgnoxP0Oq31eM8/rjrxqJtOYsYpSK j2AlYCAqcr7jcG54sEw2YJ/V0HQ6SKxqEIUvILgF0DhET9SPWUyzcNbQjYo2IdYneymy 3Fwu/lOx7gFljXGo3+Mfq82vLUst1R+RY++prqfUkpYb3Zk5SSD+9U/aHEHI/df8p4Qo c/UVgK+600WJLGoiNZavm76iCvOGvLHZNQbrkHmb5u7AJA76G3qssBr/YuE9TPUiyW7W 0zZOS75Y0ydeYzBDteIeiq10OxGN20Okb54kPCeHCQ2nSIPgoPExXCQXgK7SZel+my6j QdFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=JAJIbrJViA3J06Ko1gMafX4hZqtEEWo4wxNjnrwcoGA=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=B8xcMNid8q6kEbIn5PHXGSwuHUGtdnynbewPOzE5uKGphnSrOiwv90XaILcgRgQWc2 fW0T3Zvaf7jGClQPsxCjlE+6ZbT7via5PfWDaQ8BUZRaDpFM5a3ifq8veW8r0EWB/qgn mJRBKd6GZf9p2QX8nPcWs7XTp3VLuU7wlI+3Thrj9yoIHd+adConFfJc3diE3rPNM6cW CGFDd9bMcT9TAe6C6hlhjNVOU721CKZ9pNuTArZnq8eM8gzU1TUPT0a+/RT2sNTPCQZL UroYhuSmUK/FgzJ9jvxjJS6ngMlxFPjQg+gxNelfL8kqY18gJ3u9HSJCvQuDlDG2tnZ/ m9+Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-30a2e4e904bsi2473541fa.8.2025.02.21.07.48.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Feb 2025 07:48:52 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 51LFmn2o015858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2025 16:48:51 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/6] CI: Add API for checking package version in rootfs Date: Fri, 21 Feb 2025 17:48:38 +0200 Message-Id: <20250221154843.515037-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250221154843.515037-1-amikan@ilbers.de> References: <20250221154843.515037-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= It will output the version installed in the rootfs. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index b5b6a093..e671a4ae 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # # This software is a part of ISAR. -# Copyright (C) 2022-2024 ilbers GmbH +# Copyright (C) 2022-2025 ilbers GmbH # Copyright (C) 2022-2024 Siemens AG # # SPDX-License-Identifier: MIT @@ -335,6 +335,10 @@ class CIBuilder(Test): bb.utils.edit_bblayers_conf(bblayersconf_file, None, tmp_layer_dir) bb.utils.prunedir(tmp_layer_dir) + def get_pkg_ver(self, rootfs, package): + cmd = f"dpkg-query --root={rootfs} -f='${{Version}}' -W {package}" + return process.getoutput(cmd) + def get_ssh_cmd_prefix(self, user, host, port, priv_key): cmd_prefix = ( f"ssh -o ConnectTimeout=5 -o StrictHostKeyChecking=no -p {port} " From patchwork Fri Feb 21 15:48:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4067 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Feb 2025 16:49:03 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 51LFn2hA015927 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Feb 2025 16:49:02 +0100 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-4388eee7073sf15442555e9.0 for ; Fri, 21 Feb 2025 07:49:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740152936; cv=pass; d=google.com; s=arc-20240605; b=gf6jmNuQuSLVbQVMz/QmXq1cVzeRGG2kaZXmFoWCkfx/MeZmULSPv+Q7btMoa7+jaR kH8zj0WmEdpSSXgV+H4zysjbzZG5dxC/apqtKOtNU3lZuYl1vHVDVLHUZs8yzigpwAEv wO6JRpcHIYKo54+pd/hViroCHHBVDJhtkKUb9Ou4cX4PR631JKC5AX7evguQDvobNVNZ FWN7oc5CGNf4YvaMUDcAnJGIRtK8Tp03hHGJ37zhDjlwuQLw6usC61klMu4nqYbzQ7r2 zLO5QN43XL5Wiy2JdraejAKfEjUMQxgF2LdfVHlyK3+QeZlX0zh4tCw+Br4JJLIRDH8a MJiw== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=XuHDlrHZTPRnoJr/0VV0Xg5vVdYmv81tCnxuFurkcMM=; fh=JR+aurRs8/NBBKc5rMoFaNBS1vqRiKvvSKS3BmVMnQQ=; b=E2QnepCvMCvBsXuUMhlg21fo7E+/W0VPAUPMjg2jPvstitRo5QJKjgSP4YwzbwA2dy JRqCbrnACK4c1bOso1OmegGZap4S4nVn7X2tOH/kya2qhBNpj/gruWrQnkY3MJ6x+2IH E8F0sDEhKB0zcf71LR5Zz0Gv9kkiaa+UhS6RVnOfrde+p5ISONc9UJ69ArjMMFyqvKyH uTUC5WqBrXYozSkxGc509btLESolearwY6NIdPV9HQGjKURYcGOwJXhgXLSyKgS5Ijlw poxjWDUzV8rcCBCj7GoXdwc7FSDIUZd8ynShTnFfHUYspV/AuO85e0O5/gH8hyVzaQSI hlkw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1740152936; x=1740757736; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=XuHDlrHZTPRnoJr/0VV0Xg5vVdYmv81tCnxuFurkcMM=; b=SCHrGr7jruFSMBYBF/E6GxLdBiVrL6Mz8XD1mJYD2xxVEtkf2GpDXqtsSMTT2K6ZBw 8AyEGEbCj/cF1K/cgoOx3v+1XHwirFJIhti6HAD9lKYdyJSTXZwc6XCxL374D/scyUE3 mbbPxanIR1B7FNLcz4pUTI4JG1/mWTkJlDTq/P+AeqnPdYjEM0CBBOJddH8szen85ypU kD8CjZfMtSNiLHlelnQ00V+4tVHAOfGAUbMEMUkJav4DOaB5DcCv/Eutn+tuMd/T0U5p L0Cw1Hq3RLAwQBFT8O1mUyO3Yk0sVxcwEjghJshugGnxEKLdsT4FDP4Bu0yXrmPqMfb6 dcIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740152936; x=1740757736; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=XuHDlrHZTPRnoJr/0VV0Xg5vVdYmv81tCnxuFurkcMM=; b=JqcHQtCuA97Kt8soDM2ZO6rEdBYYWEBL+JJdjbifT0yLOsQRyDJw42ZmgNvmAu1Dy3 d2TN4Q0QDVWA0mA7dQaPaSl0aOhZcIRfVVgTekvQPeTimCVyyS977u7eKvpZfdGZwVoD 8TzG44zB+su8KTHBuJhjsRNG6gJwtW5bjxFY8+yebCmJQkTV9Yo4GRB9pZHyBE6/j6VY RUC5GIIDDmspWIZjdXDZTuDoegcEkSgTlO7ixwkxtndvVXguJzL2o1apk6b9EFmlqo8u 85JVuEYgn6snmsY88zS8ZURNgTDWM0IoLgBh29sH2ez4+D6HtSdc3mwpSBJqHHAhKYKJ uTYQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVFMGNGSZD4+rchSDeYtmTyU6+kKMJ9oLPPVgor928JqXf9tIgxLNEjc8zfdm/73GQjo2KTiDk=@isar-build.org X-Gm-Message-State: AOJu0YxvcmIO94PKMFn2mAymJy8GtiiF/QUloF/mCksChLnfyKxQo5so Seon+QhYt/EtEfhzJaiSako3i+R1pvxMQGRBSc8u4Ed08/N5BBDs X-Google-Smtp-Source: AGHT+IHCPQZQp+tOHV/mUq9qYDr7x5hjyxaXzs6TEvq4u+OlFbZzCA1+Wcg2ADJhw8HWmFdam8Uc1w== X-Received: by 2002:a05:600c:3b1f:b0:439:9434:4f3b with SMTP id 5b1f17b1804b1-439ae2eb6c6mr29951375e9.8.1740152935124; Fri, 21 Feb 2025 07:48:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVHEHa2XEje/ztwlvcqDIWn7g3cast2Y3GnsNprbDWZDGQ== Received: by 2002:a05:600c:3015:b0:439:8aa2:645c with SMTP id 5b1f17b1804b1-439a30c0316ls5614285e9.2.-pod-prod-00-eu; Fri, 21 Feb 2025 07:48:53 -0800 (PST) X-Received: by 2002:a05:600c:4511:b0:439:5f04:4f8d with SMTP id 5b1f17b1804b1-439ae320687mr27417865e9.12.1740152932915; Fri, 21 Feb 2025 07:48:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740152932; cv=none; d=google.com; s=arc-20240605; b=hEuuYGwn2m2FBoyAFXs51H40o4V/J9Kl2CKKcMgpvaZ2XPoz/JB4Y1iGugxKm7wZd/ 6dBUOE9DEAwSKXyUsm2fD7+U1IrFAHK/EI6PkPvVqT5+QSHlsM98TY4McpxaDWIiyzQN CzTfDEyyZZ36OhgX2EippEyTHJMOYTjA1HezurxbquaGW0TmzKtzFXeCRwkjZit92FSh xgDDqj3ZCVFdk2y06dirbDhW6FM8UrFLBaUAOwIFjtX5jdZkL3EX+FmUeX4zo+PxMLun qTSOQdlKqBnRr/NM+deYvrzBLRQ/s7YGJaWjnWRraTPiS7AdmHxPXfgj6vf+VaD6dI4I +n1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=+T9uGR8xfGPxQwZjLwT4ud1ExA0r3KwmzSRxaI3xMYw=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=ko3NG4PMYmUTAr72OIDKxSJcA/cQmYxQTf5TVOphi+Xer1nPyy0mMo92sJkQHU4YEZ kmylCSRwtvP/4amyiONvmlrhcZosG/9oBiJcqln9PetnMcHsIGUnsUf9TpmIiMMYhpBW FkwN8sRfzjmnFaB56b488U2szdyvrtpOByP3IXVKFyamLPSHUx8yV+NVRfGcFps7Foix YzaWtxjbga9dYF8W08/JfKtA4eySksShPPaM2OvYfUjAA/g9v1XklI2Nb8x8CMqYBHig 8CSlUETCjJq6/cJ4BbKfL+bV9qpl28B1LIx0wr/BCTYJ9OWxbApVoVPapImZ47ax+Cje 50qA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-38f2594bb55si253143f8f.8.2025.02.21.07.48.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Feb 2025 07:48:52 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 51LFmn2p015858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2025 16:48:52 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 2/6] CI: Add API for sbuild hook insertion Date: Fri, 21 Feb 2025 17:48:39 +0200 Message-Id: <20250221154843.515037-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250221154843.515037-1-amikan@ilbers.de> References: <20250221154843.515037-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Custom hook will be added to dpkg.bbclass. Method will return the file name to be restored after the testing to be sure the sources were not changed after testsuite running. This API will be used later for build dependencies checking. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index e671a4ae..d335dbe8 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -339,6 +339,22 @@ class CIBuilder(Test): cmd = f"dpkg-query --root={rootfs} -f='${{Version}}' -W {package}" return process.getoutput(cmd) + def set_sbuild_hook(self, hook, type='post-build-commands'): + append_data = f" --{type}=\"{hook}\" \\\n" + + layerdir_core = CIUtils.getVars('LAYERDIR_core') + sbuildclass_file = os.path.join(layerdir_core, 'classes/dpkg.bbclass') + self.backupfile(sbuildclass_file) + with open(sbuildclass_file, 'r') as file: + lines = file.readlines() + with open(sbuildclass_file, 'w') as file: + for line in lines: + file.write(line) + if 'sbuild -A -n' in line: + file.write(append_data) + + return sbuildclass_file + def get_ssh_cmd_prefix(self, user, host, port, priv_key): cmd_prefix = ( f"ssh -o ConnectTimeout=5 -o StrictHostKeyChecking=no -p {port} " From patchwork Fri Feb 21 15:48:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4066 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Feb 2025 16:49:02 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f61.google.com (mail-ed1-f61.google.com [209.85.208.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 51LFn249015918 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Feb 2025 16:49:02 +0100 Received: by mail-ed1-f61.google.com with SMTP id 4fb4d7f45d1cf-5deb766de79sf2355868a12.3 for ; Fri, 21 Feb 2025 07:49:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740152936; cv=pass; d=google.com; s=arc-20240605; b=cAUHtB/2Z2GAgHso2nioesHZn0mc5m/ALsG1uVSeM0TxIm3+VZamlH4eTbOc609gDq M4qz0WGPIBrwOB9s4mxj2r13GmFk1RE7h+MYyqc+jQ8WRFIplX+CinMZ/FsZ3wXbbr4M kZld8J0l9QPqN6lafRIScjljyQZw/9zXCYM6ZplsOVa5lS1szTzVlTSDNkArEMiLJF7R vSc/B9CNXtLnME4dnQB4CPJVb2t7Oo+44FoZAkHrtGd7anB3ccSxz2EipprBWmWO4bg1 mjfEr5PaOhoOPoDOifn7TRh94VmJVqIFNAdKZ7Olvye7sRj19CzhbAzVqNE4BxKOfc8N Z67A== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=pG/jtGdNq9t2J+gbVloB+yNkO74YQKPNq6dPcpF70/0=; fh=gXHaTtccQECCUCwrPWhDVPo6oRmNMQNPD6bga6mTC4Q=; b=dvkn4hb10H9QnufDzFRPP+RYNM6kWP/+Za3OKF+/4zhTPlFs+CE1UDcJ0XJBk/LWY+ ks8epodrjtpK6hVxP88Ulkn37nRxUW4NQVo16CUSyOkOVgufhEWkzZtLY4f8HEl5cV81 gTQ3hnbm1jO4c58mYhyC1K7UUmQ3UvWyDBL0/prXMZZKGzBYS31pQFNiQatQdL1awW5k ewY+rwkscktw/Zew4WcnVet+FFiUhEHZxf42HWRPt+XWDnCfvEMlLJHzIXJUZttkyiUu 8kXfLL5c954VjLuyReqwTes0XvhHwK5ds7V0mjlomBEceAwj3ho05xFNKD0KcnhhsbXi T+1A==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1740152936; x=1740757736; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=pG/jtGdNq9t2J+gbVloB+yNkO74YQKPNq6dPcpF70/0=; b=V57d8OniKZ173B1fSoxkTMhIvwx/M97oIo+MGCSW9jBtPVfwAt5V7AOMlw6VUKLU8b ZmZ2h3b4eWTV89AMh8hPxrEmj27aDHGwVlpgErnaesozjGoKlSV7i9egPW0O2dCFCE/+ Hclh78NG5qArWcn9nWy1jVtPmNDwOcK3W6qjw0dEjsmGINEC2WjUU0h5LCzkzRUbzdyf XS1l49VM9TvNedmq6Np3Io3A4uF/Cx2/0FMcgd7LzUT7T9N5JtDJdAEXyhDM0g9CqkgA 6sY+vLbGyi/kisTfL2tVnHKSNVw/M59Ijetjn8z1HAYAS56Q4A3TVDosOdBMVp3GyEII iz+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740152936; x=1740757736; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=pG/jtGdNq9t2J+gbVloB+yNkO74YQKPNq6dPcpF70/0=; b=ce2/qn/CC/2jYS8xH43/qc5fvDypfTgTwv0lpTFgcSEQYWyptZvgMAUXEiE0WiEfFU dEuJv6bRyLvQCHFS2nF2lp3GqQAEonRPuyOS5n5R1zkHKTcFl+IVycUOYobp4MnkmPgg sIX7rimHCfTfAwRnJziAjhHidJIE9okZEYrC3JXJN0XITO8/Bk3qnR+v2R5cWOQGZCgB CDNYHVRZT+2RZEAJIyrfa9cpGPr5WpqY5jU8JDNfM5dXx3Xd0ehiTI86JnJWZet0v+US hR3vGy2BaQbggzwSLnErb4jtEvGjPrpDo++DbPm6T2d1fWYI869nB7UBjE+xfmCDeRl7 CkWg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUXrwg9OSVExdDCEVmrPwvK/bHaUzBBVlwJO96QwojlSh1yusEEqQNz8l3HAPAKRb/nCy2CH7w=@isar-build.org X-Gm-Message-State: AOJu0YwpP9MuvZGIm/6WXFrPi2eV+CVxDuE4KWLWOo9XB9Qnq+An4o85 YbhaCDg/dWu6zn1moka0kpbCqV3rtm9dghN+pOEffEjCGQGTT5cl X-Google-Smtp-Source: AGHT+IHmYqX2OKMJx3p0gGSFTFxXQKDhmkXSAM9x7Q7zC7EwaETPjyAxPGNGzJfRk6aWbOXFCoeV8A== X-Received: by 2002:a05:6402:4606:b0:5dc:7725:a0c7 with SMTP id 4fb4d7f45d1cf-5e0b70d0bc9mr3053363a12.3.1740152935947; Fri, 21 Feb 2025 07:48:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVHG/Q6DNRAOF5al8FJ9U8JDZjcH+G9vlk6d1woykk3IHQ== Received: by 2002:a50:9ee2:0:b0:5de:45c1:d19e with SMTP id 4fb4d7f45d1cf-5e0a063ab3cls446852a12.0.-pod-prod-04-eu; Fri, 21 Feb 2025 07:48:54 -0800 (PST) X-Received: by 2002:a05:6402:5214:b0:5d0:bcdd:ffa1 with SMTP id 4fb4d7f45d1cf-5e0b70d0ad3mr3391540a12.2.1740152933629; Fri, 21 Feb 2025 07:48:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740152933; cv=none; d=google.com; s=arc-20240605; b=cxaEzHIPemw5Q8DfK//enD4Gx7cFijQr8xkMSDdHPHDe8eVDW7DWEiAn4itvv4cFg3 arEfI48n2DXJZ3jHb/cFsDaRHTopI6/A+WOiPBLuDyifecgTOTbOnh2h7yZsfPR169KQ KpTCEgLvUd9K0niDmtMBwElNkcBR52bdAQUduMeD9dGN0Vq/ddpdVZDasV0xfeVDj+2Z 9tR9XIHvWQQscTEJZfnrxu6eytWYGBh6B3nB/EZc2uvDAUTLSSyvjUW34u81nVp19Vmr vzIuvFp0EcxKobx8MUDVnTStGeZQ2gFdM/ztjanyBJPyH0B+/LS6SsVBJ9oPYl7YX+bG AmFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Sokv0qIRfU1yVB8eEiaAhtUK9Ir35Ik4/+YwJsc/nZ8=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=Xc9rqLwJlhvl2kOAOUUp3MZTOqGaef5suHMsewC8mmuOtxR7XQusZuM55W4x83S6uK hwSXcB7bDXlFpAX0+cmhGFt1nlY+d7BYJoBshw5G8wLcC8P20KfrJa6HAvC3OjF878Nb iKOGgijMlHaq8x2rfUm9Qx4cqOq513RYpRVxzDpn6dKXBtm7bvAHvXjPzu9AoSSNh+AZ FkmNf/MqFadaIaZij478HllhIc1tNj+IMUE0+6XQ7lYDqGathlvPywU9u40ED9X3J8dc 6rYUkZQ1imntWjcGvvYng1Rol6kUIs3bKA+dyUKrTRjGDG9C+2a5oHVvDmO/WMxwL2TI VfnQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-5dece1b5e95si315381a12.1.2025.02.21.07.48.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Feb 2025 07:48:53 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 51LFmn2q015858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2025 16:48:52 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 3/6] CI: Add sed as essential rebuild test package Date: Fri, 21 Feb 2025 17:48:40 +0200 Message-Id: <20250221154843.515037-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250221154843.515037-1-amikan@ilbers.de> References: <20250221154843.515037-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= It will be used as an example of rebuilding essential package for using inside sbuild chroot during other package building. Signed-off-by: Anton Mikanovich --- meta-test/recipes-extended/sed/sed.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta-test/recipes-extended/sed/sed.bb diff --git a/meta-test/recipes-extended/sed/sed.bb b/meta-test/recipes-extended/sed/sed.bb new file mode 100644 index 00000000..c981defe --- /dev/null +++ b/meta-test/recipes-extended/sed/sed.bb @@ -0,0 +1,15 @@ +# This software is a part of ISAR. +# +# Copyright (C) 2025 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +SRC_URI = "apt://${PN}" + +CHANGELOG_V = "+isar" + +do_prepare_build() { + deb_add_changelog +} From patchwork Fri Feb 21 15:48:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4068 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Feb 2025 16:49:03 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 51LFn2vZ015929 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Feb 2025 16:49:02 +0100 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-438e180821asf11823465e9.1 for ; Fri, 21 Feb 2025 07:49:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740152937; cv=pass; d=google.com; s=arc-20240605; b=MxpquoVfomYOOyizUcOMF7ixWOjjCbwTeQDtYH2Fat5DQEcXoBzyhJZnl3qjyxWidk deaqmuaaReUte6hxQB78btMOAI5sou8/xduecO9Iln7Fqp5a6fvl5mW2Y7siAfOMZTbe CuSUm6Qg2rR4ogwj55DyXmxDRp4zT31f2MuGw0WXWt7SX6lQmCwBYs8gI7I+HJK6SBIL 10JJvPNWHIWG5t30clrxW4VypyObWSpES7TZNygHpL4K/3dZ4otKGKsYVGQjWf7HgilO 7jt0FBcwXqX7HAcfu/Wbf9QbqMmnsSN6vXuRHkD91Az5zpryRK4+aIerZoHN+8gx2E6e YQLg== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=kax3d4Ums4ZpjKCLs3L+nQU+C9x2sTz0hLyymbgxlZE=; fh=1ngCJ8fZoKc7Va3mnlTxfctqyA9CRR9kUdTbG03a3ro=; b=kOis8Lf1Z54tX5BSxDDP3+djiEcNkfPJRgIWx5TkFhCZAk64dKtBhTZBBhTfbqJHw6 gacbuiwYh5w1lMu/OjA0v+eUqTHS2m8AAQaAbq8B6DHVAhRqNccUHCCxpp49TdvMPUzf FzNefLGSds8PzQYUAnjf6+1aSJvWzICaogQjcyL38j+FH0BUZiOoHsUE3rk6ENdwoR9N /QGMLmLOcglcswSR0qjC7b/8vRndFDaOjF50Jb58RwaqpmyADEHFUyYK2D7VQtjBfGsn iqqHfBvhxaXud6BNrHl7MzRYq0RUpPIu/PqTzEdRMSghhdy/XZcqGx/KBJ7d0JQjHyZ7 Zh+g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1740152937; x=1740757737; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=kax3d4Ums4ZpjKCLs3L+nQU+C9x2sTz0hLyymbgxlZE=; b=LPc4IE7+XzrrhJriOW3qD0HMJacXmmbh5e6SQq2rsf5ghyz3JL1R//9t8m1hZLHDrA jLrpYx1tSiXshZX0yWKVOILo0Ejvfptbpg20tLXdDCYPopkV5llliovYg7rvpUdQdhGk qeDv0HSNhjcJSFfgOa81mD85lQSaN9Gy/d/EPWD3hEJH7HLzBhbn70PVQbso7jmEeray oDG93m4JJPnCw577vJ7m8rZ9riIv4o2FKxk5je7smnJWKjvc7z9el7VkI48I4TYd4Zsy In/5NtiLmAKm9KBCcvxEq9jRTjynLpdgGrXKSbwAEKuYviBc97O8e9egFbCVJDsZP4Ap wNjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740152937; x=1740757737; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=kax3d4Ums4ZpjKCLs3L+nQU+C9x2sTz0hLyymbgxlZE=; b=C503kN6tPRLMCekvJEssEB4NRt5C+SYWZB6/85hVuO6+iUWEXmDDA4Na7cmKD6fLBc d0bR10kLfZhZ2mZ8HiLndD8NrNihyOBXzyL7kUXAhIk5MUnQnBjBe7H5Gr7AvOGQQ+mB 4HMyUpHWFMP1J2vlzOAzuu27Bxiwr/4mwCp5JxAgKX0CBh5y2BlOB7QuK1JZ1/KZqftD HBzjjW7ssmYVKfDvTnqS4e7CQVZ7gcxHzBpFeApyoZkEw1W/QPVYsjSwJ1WSMiiVyC/G mPuVjsseuJ2CtmjVaYbvgtdr0KdhLKS1Ulvytx3u/SkPoODUrGRNftEepOSP9wGO0zQs vXgw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCX61Hmv7KwP6jgrLciZLZ3iJfh58h8Enj9qr4Zp7hE7xbHk+buIbYS0q+ID2QfOPZhkSPxOUqc=@isar-build.org X-Gm-Message-State: AOJu0YyWCjBIirkajJ4wcNSLF9qojs/8IJ3RPTiELr8X0+yv+XbHsm4V 3b5+xBPOuSNUT+fb1+AJnXbwjjg/emULAr3flD0MJZd4J4CT01jP X-Google-Smtp-Source: AGHT+IFiDG1ZQJsTmn5/MiYY6rXqbFt5B3KaTiIOCsa6WArQPAQKzI5d2NRSrrCvPyEEv3SpUVUN9w== X-Received: by 2002:a05:600c:46c7:b0:439:86fb:7324 with SMTP id 5b1f17b1804b1-439ae1d7e16mr33430565e9.4.1740152936466; Fri, 21 Feb 2025 07:48:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVHe3rFd3pC/Bg3KvgZLqOVxDst+YDKZodKUEIIyjBqG6g== Received: by 2002:a05:600c:3550:b0:439:9744:6876 with SMTP id 5b1f17b1804b1-439a285722cls8576395e9.0.-pod-prod-04-eu; Fri, 21 Feb 2025 07:48:54 -0800 (PST) X-Received: by 2002:a05:600c:1ca1:b0:439:a4d9:34a3 with SMTP id 5b1f17b1804b1-439ae1e6619mr32791645e9.12.1740152934225; Fri, 21 Feb 2025 07:48:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740152934; cv=none; d=google.com; s=arc-20240605; b=dU2yEZ+Xv30dtgg6tvnirP6ZbMBy5ChU6tpKgZdXs1Q/4dwsVY4ySZVGZ8evk4tiP2 +xOMT3uR9DyvhNVip590EnqEC+Nfvwb42RrL/1L/Vor8L+pdzcaOy4H8T4E9kEgFtanD /vjCuvNcSVmPQvCyjlC9Rc3tLvPgUMZ1ObzQz4vJJMj9MTZv07082Nju4ebZ9djPYK/D znyn0BxFqe3VJ0w9bPi/kGALZ8hHHHVwassfAksIcvhkSgOFbx849I6LJdrM2cH+zr9J 8S55aiBLUWlaoqyLs/PM9VZv19UVrDncVWAliHpeiak1tNcuSOQNFg9/Kp22FMD1inaU PeZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=UegNh9q4K91GF8M0+G8xMXWagH/ZT67+iEkAZhtlmyM=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=Wnl7drQaJPPRN+ZMwHIGsMIKYPQITnABsVN00PC/VqtZ8EHz2nXJJiBb8N0+O9erqr +44aTeszS4RB7M5Bd5TFsrsEXQvjEfpdJ2yT9xXBzNSPbAugglDMo9s2c66jqxw+U1pn iPwKWU33NIKX2VPdUpfH+4jpHc38Dlh7LTSMsHHTBT3nzXgBPIFMGs1Ym8zLden7u1pA DQM632NvN0CX6T8P9gAYf35Mr+uRA8M86jT+hKIQfiqhO+0CFMflGx0YVFcCOF4ljIaI T4V5o1zIs9mtc6YbQxi3XqJyfIqzse0HZRd/2KguTMfvyx40d0MQNMvODuYuPjrUps2s jlYg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-439b0131a99si350095e9.0.2025.02.21.07.48.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Feb 2025 07:48:54 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 51LFmn2r015858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2025 16:48:53 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 4/6] CI: Add essential packages rebuild test case Date: Fri, 21 Feb 2025 17:48:41 +0200 Message-Id: <20250221154843.515037-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250221154843.515037-1-amikan@ilbers.de> References: <20250221154843.515037-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Rebuilding of essential packages (already present in sbuild chroot) was not covered with CI before. Add a testcase for such a fuctionality. This test case also covers f62de679 change already merged. Signed-off-by: Anton Mikanovich --- testsuite/cibase.py | 101 +++++++++++++++++++++++++++++++++++++++++ testsuite/cibuilder.py | 4 ++ testsuite/citest.py | 25 +++++++++- 3 files changed, 129 insertions(+), 1 deletion(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 075535b1..c692719a 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -1,4 +1,10 @@ #!/usr/bin/env python3 +# +# This software is a part of ISAR. +# Copyright (C) 2022-2025 ilbers GmbH +# Copyright (C) 2022-2024 Siemens AG +# +# SPDX-License-Identifier: MIT import glob import os @@ -359,3 +365,98 @@ class CIBaseTest(CIBuilder): self.fail("Source packages are equal") finally: self.cleanup_tmp_layer(tmp_layer_dir) + + +class CIEssentialTest(CIBaseTest): + def init(self, pkg='sed', dep='enable-fsck', **kwargs): + self.__pkg = pkg + self.__dep = dep + self.__flag = 'isar' + super().init(**kwargs) + + def perform_build_test(self, targets, **kwargs): + package_targets = [] + dependant_targets = [] + localapt_targets = [] + cleanup_targets = [] + rootfs_dirs = {} + work_dirs = {} + for target in targets: + package_target = target.split(':', 3) + dependant_target = package_target.copy() + cleanup_target = package_target.copy() + + package_target[-1] = self.__pkg + dependant_target[-1] = self.__dep + cleanup_target[-1] = 'sbuild-chroot-target:do_cleansstate' + + package_targets.append(':'.join(package_target)) + dep_str = ':'.join(dependant_target) + dependant_targets.append(dep_str) + localapt_targets.append(dep_str + ':do_local_isarapt') + cleanup_targets.append(':'.join(cleanup_target)) + + rootfs_dirs[target] = CIUtils.getVars( + 'IMAGE_ROOTFS', target=target + ) + + work_dirs[dep_str] = CIUtils.getVars('WORKDIR', target=dep_str) + + self.configure(essentials=self.__pkg, **kwargs) + + cmd = ( + "%e dpkg-query -f='\${Version}' -W " + f"{self.__pkg} > ${{WORKDIR}}/ci_vercheck" + ) + sbuildclass_file = self.set_sbuild_hook(cmd) + + try: + # Build local isar-apt copy + self.bitbake(localapt_targets, **kwargs) + + # Build package for target + self.bitbake(package_targets, **kwargs) + + # Cleanup existing sbuild chroot + self.bitbake(cleanup_targets, **kwargs) + + # Build other package + self.bitbake(dependant_targets, **kwargs) + + # Ensure updated build dep used + for target in dependant_targets: + check_path = os.path.join(work_dirs[target], 'ci_vercheck') + with open(check_path) as f: + ver = f.read() + if self.__flag not in ver: + self.fail( + f"Package {self.__pkg} of version {ver} used for " + f"building don't have {self.__flag} flag" + ) + finally: + self.restorefile(sbuildclass_file) + + # Change rootfs bbclass and rebuild + layerdir_core = CIUtils.getVars('LAYERDIR_core') + rfsclass_file = os.path.join(layerdir_core, 'classes/rootfs.bbclass') + self.backupfile(rfsclass_file) + try: + with open(rfsclass_file, 'a') as file: + file.write('python do_rootfs_install:append() {\n\n}') + + # Build again package for target + self.bitbake(package_targets, **kwargs) + finally: + self.restorefile(rfsclass_file) + + # Build full image after all + self.bitbake(targets, **kwargs) + + # Ensure target rootfs use non-updated package + for target in targets: + ver = self.get_pkg_ver(rootfs_dirs[target], self.__pkg) + if self.__flag in ver: + self.fail( + f"Package {self.__pkg} of version {ver} used for " + f"installing have {self.__flag} flag, but shouldn't" + ) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index d335dbe8..5aa64e31 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -109,6 +109,7 @@ class CIBuilder(Test): source_date_epoch=None, use_apt_snapshot=False, image_install=None, + essentials=None, **kwargs, ): # write configuration file and set bitbake_args @@ -155,6 +156,7 @@ class CIBuilder(Test): f" sstate_dir = {sstate_dir}\n" f" ccache_dir = {ccache_dir}\n" f" image_install = {image_install}\n" + f" essentials = {essentials}\n" f"===================================================" ) @@ -216,6 +218,8 @@ class CIBuilder(Test): f.write('IMAGE_INSTALL = "%s"\n' % image_install) if fail_on_cleanup == '1': f.write('ISAR_FAIL_ON_CLEANUP = "1"\n') + if essentials: + f.write('ISAR_REBUILD_ESSENTIAL_PKGS = "%s"\n' % essentials) # include ci_build.conf in local.conf with open(self.build_dir + '/conf/local.conf', 'r+') as f: diff --git a/testsuite/citest.py b/testsuite/citest.py index ee965278..9e2c1b43 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -1,9 +1,15 @@ #!/usr/bin/env python3 +# +# This software is a part of ISAR. +# Copyright (C) 2022-2025 ilbers GmbH +# Copyright (C) 2022-2025 Siemens AG +# +# SPDX-License-Identifier: MIT from avocado import skipUnless from avocado.core import exceptions from avocado.utils import path -from cibase import CIBaseTest +from cibase import CIBaseTest, CIEssentialTest from utils import CIUtils UMOCI_AVAILABLE = True @@ -400,6 +406,23 @@ class SstateTest(CIBaseTest): self.perform_sstate_test(image_target, package_target) +class EssentialTest(CIEssentialTest): + + """ + Essential packages rebuild test + + :avocado: tags=essential,full + """ + + def test_essential(self): + targets = [ + 'mc:qemuamd64-bookworm:isar-image-base', + ] + + self.init(pkg="sed", dep="enable-fsck") + self.perform_build_test(targets) + + class SingleTest(CIBaseTest): """ From patchwork Fri Feb 21 15:48:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4069 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Feb 2025 16:49:03 +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 51LFn3TH015942 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Feb 2025 16:49:03 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-43988b9ecfbsf12583525e9.0 for ; Fri, 21 Feb 2025 07:49:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740152937; cv=pass; d=google.com; s=arc-20240605; b=HbTDnJMhxUDP5wgfd7aUYRiLrCNGEKg/LOEKE9buh/uqrHYywl6SH1KEMygesRbwKi JHG9KVDLa7IB5apKD6yoLCB+e1oAkw51N0+yH2kOve6uAahbBUHQAnr50ILrMM+imugM 8nYfS/et7KqGN3gzq37IU9JNBE2YIsr4AIRJjdYUuUljvOYqnVIyTYCkunUG/Xw6w+LU XVOCQdIN4dJfJQ+Z8SG1lsDJcDn6bnwQplvLpoYvJoMmK3wBheL3W5lZbrBM1E+HDEjp uwqjD+TamGdAiH9U2V65HCn+kREITJL+8UCVjwLMEtDawfLxJV6BThdGdpNlD8PDhzc2 KBwA== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=q8z0xLC74a+Rb+ODyRL6HiR6B8LaBP5jkjpe8tsh7oo=; fh=nXJsttcleDKWRt2eZcF+f+XvbUpiaOhdjFmS8oDjGvM=; b=RpE3j/VTQnssvFeSwhO5maSZhy6+FV5BhfgesrXQ32ZMHzoTD+005/PGq4rbVgqzw/ tVURxS9xoyZYsggl7HcAEkbQ+lTOlFUvd8tttZKZswSezOowfCQ28M6hJZR62bUTgnYY H+riIWl/xMvF4X1hWryenxjTdaKnE3FACCD+mRPBBQVwRa+HnTDkqbAMlww8NzXoVnCE gHpmg28F2B2u09DFEJLThnZYA8x1u8l/j0qcjxuzhVTXTOAnkzpTOWggu7L4X6fOViri yvhuyCSza0TCMdFzPHlUrkQSElXbOD1lo8K4AoLLVwi1B1i/blxpSWETNDVOtlj0aIla i+gw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1740152937; x=1740757737; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=q8z0xLC74a+Rb+ODyRL6HiR6B8LaBP5jkjpe8tsh7oo=; b=GFZEifejPlxWwd8m7v/Gxoy3U2YFv2MzPcYU6XUKWFtxlXegCEuDlHvl6utjJ4Jd47 VM62TO5MEVFmmp81e4MJXGv74sjkbWdeC1skWAooOcpDIduKqQN5nKSnO41biuWhwZfW NVaN9ZVd7wGl3sWFzHMkHpVhEZI5C5Xtlzj4jzYtiwj98NU0mPf6lTncNd/0EPKVk4oe hwELGcvDoKyOz6/J+BE1pd+uu87GUrM+cWwx7sroPAjJZv30I6bDABRyO9g3tnBQOrm2 dsYiCV/EoV4mUSmP/Wbe3g5L/NB1184J1CXGgmdTKcnWwf1TgLnTRRBnVAWj+O50rhsc bzuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740152937; x=1740757737; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=q8z0xLC74a+Rb+ODyRL6HiR6B8LaBP5jkjpe8tsh7oo=; b=mrru3pFX5PIsBhmH0HxFb2kGaA/23BXEQh456rBcg99W96lrEeALJWbRKIdqoMLzf7 zzqk9KuWabm0RP8GcI6090Nv0KpsOoCz/Dbumg5xCveppyyF6vX5e/Ow1yD+9aJJowaN /NcM/JPS497118vI0Hki77EHhTdQsymr/wyupQ9GZTIyxrNxhm+D0LrmQCRj5754IGQV lf6Qh4dKWZrg/WEJmMG/CEqqcRlNm4k4kTrOvAjWKTfhUJ++ujZQNbNcC+n1by2NS+3C wk8gwTZzXytNbhYTdNVC/eIY1GJx/7PbmebSZWw38I2SjHUTs3mHaBlZnvkrIyKimNa3 1Q5A== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUwamRAB1gC/fuPAuJjDpSL+bgK/0CH//KCvJ5wzVW9LZOGTo2lD6aJ4HREc8c42MiEFJgZF64=@isar-build.org X-Gm-Message-State: AOJu0YwedZlIpW2hmnVXfAn94z465+uWrpXYjYcuLk/wR/G+JoKbtY6r m1T+Zwe9Ct12Rft1q2ZAyLc+AxCEPsGqVC3QCzKYDriFoUVju92W X-Google-Smtp-Source: AGHT+IHpGqNJUukgXuNB/l7c0Lh7PvdPq5KJ49NDCNAdmM4O9hvFG+nKV4SM0X3PkZVFuICYHk8S3w== X-Received: by 2002:a05:600c:5125:b0:439:9951:1220 with SMTP id 5b1f17b1804b1-439ae1f1415mr32849495e9.13.1740152937221; Fri, 21 Feb 2025 07:48:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVGgFMaq+7eQobwE7+9J5A1DQ0dxq+b6uJhFEBEIxB6jZw== Received: by 2002:a05:600c:4f0b:b0:439:935a:474c with SMTP id 5b1f17b1804b1-439a30b5b26ls15553725e9.2.-pod-prod-08-eu; Fri, 21 Feb 2025 07:48:55 -0800 (PST) X-Received: by 2002:a05:600c:4f84:b0:439:955d:7ad9 with SMTP id 5b1f17b1804b1-439ae1f145cmr41713745e9.14.1740152934879; Fri, 21 Feb 2025 07:48:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740152934; cv=none; d=google.com; s=arc-20240605; b=i8Oi4MB71ptZtLb+ZuB/ZfGURWQgZ12CqzmpxUmiHrP1SeLE63lLV75/r2FbdeyD86 Oo2iEPggYlAYStczO6kUFcc4cgbrEFxx6/d01WeXvpvDBvN+NDzsgUvmlqxOLFt81JBm VOk2vdH6Pi/IimcFqSeCxycnHCzcq9pAZpgTdeEO54WVP7S5JhChLoTApBiH871I9/xb 257jph1TXXjgzgUOBk6oYSLRpb0utgXBUL47J3Y3KYjMlcO2vdD9VfCJcwIfe2N2VhpD EpyPdS5QmRs10JxI9qY29j3M5PeYyHRSQgcDopBYszCil+vT2lX24Ch2TabSIStofMbE cp5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=5LozuxQawC3ruAA88iTwbu2fQe++F9MrDVbrrYH8UPM=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=atzDrwIANQn0ZH0Dvix7/MC6K1IMknqbF5rb2k/61Lc1bO2lhrZpSiGeNjOK50HBsV pYq2Lakr7PlIQ2gxc13NYrrU2nxQi0W6kor7HiOB8inh3UORfz7TsxCbzzZIDPHvm3Lk DPREwIazLaA9/oaQUxSLXF5ScDQuzF4oXIemNa/7Vyn27dNvuXo6dPgUjpRrLua21eBL cu07Sxw95zLYPglIzElFIYelnqwSMnnf1I0o0szLW2rynI5JtMN1adcV2DOZ3WLTTghi OKXdu/SJy/oqP224PzTdtkyK6qXEbXmmlimZtgKE7ETRaMvmSkWAwOACwaVi9TaV4Uoh syWA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4399c4ffedasi3340685e9.1.2025.02.21.07.48.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Feb 2025 07:48:54 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 51LFmn2s015858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2025 16:48:54 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 5/6] CI: Fix getVars API on fast recalling Date: Fri, 21 Feb 2025 17:48:42 +0200 Message-Id: <20250221154843.515037-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250221154843.515037-1-amikan@ilbers.de> References: <20250221154843.515037-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Running getVars several times in a row sometimes failing with 'Reconnecting to bitbake server' messages. Fix this by waiting a bit before trying to check bitbake lock file state. Signed-off-by: Anton Mikanovich --- testsuite/utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testsuite/utils.py b/testsuite/utils.py index ffcb5cc7..e82f5a22 100755 --- a/testsuite/utils.py +++ b/testsuite/utils.py @@ -1,4 +1,9 @@ #!/usr/bin/env python3 +# +# This software is a part of ISAR. +# Copyright (C) 2024-2025 ilbers GmbH +# +# SPDX-License-Identifier: MIT import os import sys @@ -27,6 +32,7 @@ class CIUtils(): fixStream(sys.stderr) # wait until previous bitbake will be finished + time.sleep(1) lockfile = os.path.join(os.getcwd(), 'bitbake.lock') checks = 0 while os.path.exists(lockfile) and checks < 5: From patchwork Fri Feb 21 15:48:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4070 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Feb 2025 16:49:04 +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 51LFn4wF015956 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Feb 2025 16:49:04 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-4394c747c72sf10649585e9.1 for ; Fri, 21 Feb 2025 07:49:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740152938; cv=pass; d=google.com; s=arc-20240605; b=J6MnYjIcy/8s5inBQNsFYTk/Y1Fv7OOHdJgDNvQ2tz/wHXi+7GQROV9A3tfVjX2jCj b7xLjIFI32Xl0x46mdwxpE1UJO+B+j2TyFGJlnHS9HrikMiloFORIZWlyvSLGFgQgDjY QB/CoC0Ot9gdQy0opbdMb2Atsr9PbC4Ls8UrP55EFGo7p7qLAxLZGzAM2rSxqCRepVYP J8ubM4f7n6ZaHZvyp8pIEBVRw7sAYcsT02Kcj5Oi/I/sztUO1cmPx47e+1SQAYb+FIZL ZxgTvyR5KY6fNjq+CDwBadNEjlBov0Qutm4iyeWKgrRoueMPbizWxKKTC6QT0PCBv/2R 1KEA== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=iRALEAPcQu/e/6I3lGfNa4hUaWyaeHZq92St8t6EyeY=; fh=jpRVUsKUWfZWtw59HB1+2bsgLFbmka5hMe1DYXEdPKs=; b=Uljr6/PsouMQfKJnD2+ESYQSS3YhINGvqbAT4V+grmXPu2eq4QIaQMrNJ0vrmwC4YN DiQZglZpgZHrf0SzkIWdEdedW0fyIlnLrqEO2gHkt+tzWJo6omEdhqiYEmraMlbQgp9D 8XrpY1J96n61Su8k2hyhdewqSG2J6w2SgXz7aZuMWbFSvr7k/c32ky6aedR+mOqIWQPW 073yhVu58Bed3El9bMsetjb77DIW3KfUggB08f45IlDfLOn3D7845+emG5hnwIxbcu01 a+d7++TckR07zbiT/UUr+2TVRKPnRhi/eECehnGN5cDSb09+zEVgow45HRuSdW7aJJnV rt/Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1740152938; x=1740757738; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=iRALEAPcQu/e/6I3lGfNa4hUaWyaeHZq92St8t6EyeY=; b=sv3FM2AFpL0jHodJ75jSKzzmcsQSahAaz3c8Bcx+8FV77HCFfSHhQSXjHnwGrd4SrZ x4zV45UJKfF4CIuGT2vHjijUp/zu3A/tszBKWYQX9klkwhYOKK+VjvkX7bfdoRre2f2k CicAzAPXOggU94OCW6dmFZ8l6fIerFAM2zogGdWz2inQi7/nJ+tqbdUe8CLKQtEGT009 YZ1G81XBs5UE58JDLJiyjI6K3MGkWhNTOK3CZ/EtPHAi0k9SB4WrX3mn+WrlZkqE4xuL 3E/NFWjiixO+VXiGZQFfmwEkg4xG4rUIjIblW9AC2n5RDvPp3Q2vrjUdDwnENvjaznzO +xog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740152938; x=1740757738; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=iRALEAPcQu/e/6I3lGfNa4hUaWyaeHZq92St8t6EyeY=; b=NNNoI98IeUwkLZiMn/2zywj1uyPaq9hKceXkHnn5BujKCT1YXV6V0ymIyrjP0oP6rd tp+WvLzGDh3WNRVCc72Swzk/suQhlIlI8xUk8T+ldRIP3W5sjgCG3D66vmyh5pjHbqrg XVSsn9Jyy8rFXbSnCxDMLNfCwSxhbco++cDmLVNSDbksyJ20VEw8N2xY9mW4copaF8C7 xgig2/5MET2nJbLuOvBVHRpUV75PSPJGURbtfupZt4ywLmZSHpF3MKE6ftAs5Gca1mAu T1GSOGq/OPprcQxvLWnJbvA2L+88ytlC9zhcI6Y/+ETANhhkqVqk7z7cPrcp72NsOow2 56tA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWDDPFkZsgPDrfCrcshVf10J9e2jL2vZGZTkq89/Y8axz7sCgINU17kKgh712+ef+CWw0H1HIA=@isar-build.org X-Gm-Message-State: AOJu0Yw5gU1edhQd0L3DweKftrWXiC3rGKmXNct9DOjudn+lt0VsGCEK cSOi3vrNIwEoSTH8VhH0VbSUQBGHPcPp1fhYjoRDw8lF2b3CubRb X-Google-Smtp-Source: AGHT+IEjOO8MuyXiQRFWhSVcXdWC2koAoQqivXabLc8WJyAVGXq6x1mLz7RyWigbVU7veHYecKjq3A== X-Received: by 2002:a05:600c:511e:b0:439:88bb:d017 with SMTP id 5b1f17b1804b1-439ae1d96e4mr34757685e9.6.1740152937466; Fri, 21 Feb 2025 07:48:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVE4NBaSioxX6vvfgxDsE6AgciuBUZScuKjBE3IQLnzRwA== Received: by 2002:a05:600c:4b98:b0:439:9551:b4a with SMTP id 5b1f17b1804b1-439a453f517ls7461695e9.2.-pod-prod-01-eu; Fri, 21 Feb 2025 07:48:55 -0800 (PST) X-Received: by 2002:a05:600c:3b09:b0:439:8b19:fa87 with SMTP id 5b1f17b1804b1-439ae1d982amr35430655e9.4.1740152935478; Fri, 21 Feb 2025 07:48:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1740152935; cv=none; d=google.com; s=arc-20240605; b=Crl8rzlAwNbQNNgPFY6uJRzd0F4kzN7awF4T9MSMC0lWVKlI+l6SqhYtZpnMqZeQP3 hx17tOh7yt8eLe4dlEtoKlvVJp81YmEGTkvDl9a4bxN580zZg5twuom6Nvwr7Mu9GLEv Jwe34AoCQdJ9JOe8ElXSxlAkw9afSua5+GPXDscqHpJof6rzbdE0hzQ7vSmb3g0KSnLO EvV+TPZkJf3Mlb+NTJQfHu+028HpJMNr/RdWZ8R+B1vDfakwkzoc9ev5Q53w8qbvRIsH cpZM4Bydh9Rv7JlpZHF2yfrbvlaaVwFYHuJQGQM6Tb6bfWNEVTGE/xt+gbChdK5A2C85 J3mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=vPbfu/hzh980gWpDPupQ1Jkf5vlpYDjBSXkpfzPWgg0=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=HYzNYBrxlRdilhchIrFemv2okHyV5HLpDhzrkfm9XaKh9YKs2im60gFBkSG/DiMyUy NXDAiTcDXxyZvhJherem/ED8fZ9j95i/SxSjzktWOmbJZTccXHspm8X3UWV+hVD0m7MW 9Koh7aO/U8gw9C4THtoQYWA1pRRE4KGThsywNfahc/mV9KRNaEGjQwUOl4AvslJOl0h0 5xT0TscJIGvryog63AKYCXB2TM2JsqlpYg0uu5zTozI1PRQru5QJZv5ZN3f8J5dOH3lO jlr+/3jeGOeqF78VBqsdTsBCQIZKpjebh84oa/4e3+9pw3WMFSfiaQjcUj+H+8cB0FnI 06Yg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-439b0132594si341055e9.0.2025.02.21.07.48.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Feb 2025 07:48:55 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 51LFmn2t015858 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2025 16:48:54 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 6/6] meta: Do not update isar-apt during sbuild chroot prepare Date: Fri, 21 Feb 2025 17:48:43 +0200 Message-Id: <20250221154843.515037-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250221154843.515037-1-amikan@ilbers.de> References: <20250221154843.515037-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= After moving to manual isar-apt update during package build in 0e846829 there is no need in obtaining isar-apt package list during sbuild rootfs prepare. Moreover, it can results in out of sync between the data in /var/lib/apt/lists and local isar-apt copy of the recipe. In case of rebuilding the package already included into sbuild chroot this sync lost can raise 'File not found' issues with updated debs. Remove isar-apt update during sbuild chroot prepare and do it later for every package separately based on local isar-apt copy. Signed-off-by: Anton Mikanovich --- meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 6478d3a6..f5d1f1dd 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -1,7 +1,10 @@ # Common part for build chroot filesystem. # # This software is a part of ISAR. -# Copyright (C) 2015-2021 ilbers GmbH +# Copyright (C) 2015-2025 ilbers GmbH +# Copyright (C) 2023-2025 Siemens AG +# +# SPDX-License-Identifier: MIT LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" @@ -56,6 +59,9 @@ SBUILD_CHROOT_DIR = "${WORKDIR}/rootfs" ROOTFSDIR = "${SBUILD_CHROOT_DIR}" ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" +# We need isar-apt configured but not updated yet +rootfs_install_pkgs_download[isar-apt-lock] = "" +ROOTFS_INSTALL_COMMAND:remove = "rootfs_install_pkgs_update" ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" # Do not cleanup base-apt