From patchwork Fri Apr 5 09:21:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3476 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 05 Apr 2024 11:22:18 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f185.google.com (mail-lj1-f185.google.com [209.85.208.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4359MH3O000972 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 5 Apr 2024 11:22:18 +0200 Received: by mail-lj1-f185.google.com with SMTP id 38308e7fff4ca-2d6b9530792sf19479921fa.2 for ; Fri, 05 Apr 2024 02:22:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712308932; cv=pass; d=google.com; s=arc-20160816; b=rPtd+m1tS+NYZF0fKfoI3DhypmTDg3Oc+sqVDeyFvh7DujcnCS4+gC4tTu03PnYNbn kulJQjC9q+fSjrXnpuXaToBj7kIchm9bYnanmav8MYqWvQvGBFqOodzC+aNGkkBgP1/u mfhM6/d8XyFWyq7kcPLTBx9n+z2uEtfkKtgubnzUO56id0zp5ureMT9xPh1UnCqDk3M8 8a9Dt0jqZsvI2chrAQoRYBZWFninXu9z0zwvo+dnRVlrR2Oa/wuArU29OZHkvaS6saPk ghY0wlc/27tRX/t2xjKiO2gcAf4URzVnOxIpSUwcHZ1xp3dETPQE8Q5yf3vCCpuLE6er c9lA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=3ZvKJXWaaC3l7Gk6XGlgRpbfUMHSvVklDXn+FmRYOo4=; fh=5Vb0jGSEIBLcR/S4CUsZVP6YUED7Wb9QLSPrTYBSupw=; b=kpLmeVmVL9Is3emVk9w67HMlkHRmIVfkUZ7M71OHPdAjUkSPRmVSb+eZxSie5SSWx6 c32lqemqan8URaj7PUcl/jX506LYT7uW0on6D+shi7FSMyF2m5Qlzc2dslW/AREYofs+ XegBoOU8tpYIYbSLOUylRB1ADHyV8yBQrlPA31judRJUc21zkupIG2H/H+7aSGZ88J5V APWpIuAHBO8CfbAdeCHi8GFjEO9WPMlS9Vs3ky3tFiHhePwGxneFwXB71vYD/zU3pXmt nVVyJmFl5spTPSaN2NA6VIMfmIoNa8zCJjd997ehh1kgamjZ4zu8Qqj6V/wGL+bk8kD9 lt/A==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712308932; x=1712913732; 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:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=3ZvKJXWaaC3l7Gk6XGlgRpbfUMHSvVklDXn+FmRYOo4=; b=Vhw+N0S5szEiJ0xlZKjKaq6x5kOoVSPTVoSpevIKl+BPZiz1VeNuDPhMC1RwxqzOqd RlZTLlAmYhftC5a3ucNvLT+LCfxyP7kybWllemC9BsmPjyh3sBthcYxmLt1HmPU8p6SP dasDpQSwmt0EmZzN0vVpLAm+2Mr0zKr2b3upuTeg6vXi/YmAlq0K3J7bLX4Hfcrtxamq UVwxMfrVninDrxrcuEemXbjArWfscVRqDYYU/cNX4XePKedHGBOZsDlkvsSAT++PCVFO XSV8kbQjC65zOS0p5H7f0jje6osXWImZGpUTJZTQQhNylI1X6v6+voILf0KVVrLm/Hxe /0Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712308932; x=1712913732; 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 :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=3ZvKJXWaaC3l7Gk6XGlgRpbfUMHSvVklDXn+FmRYOo4=; b=XfQS4bbesZya0VZbrsXeqRF+6DnH1svsWMXfALcvgKVyF0OPlaR+7VvJqeJG5On44p GQdaUYTz0+6ejb9H5z0IvfxkAhjDX5GuOIWWbJY9YxwhMN7e5v5JPfLsaq9XA5GFy34F IMaxvadpOe7G4jCsWR7CyfSTSDIFaxeq8Jp3KbHbfPikc0gb3fpze4brdKiCOYblpLXO 6raRgJ07XXdOplHsUII5Ksh73AQgM8x6O3GXrwWXIvoTPRDYD+S5JXq5Qb3FkKfquwzV E9wAm0jTVEe5ecJ9SqIf4OEXHvmJ6GhlRcM3w608lZLYQJd6amy+SAJKvk7srq3oycGd YLuw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCX4yFfYAq4vxQeft6c05GA3MBE4DADczlyGZTr9y9fAVnhRTS2HLzC8QfXdKpcZpvST00qfJ0Yu6pxNZ5OSr/Hy5hDQ7KE= X-Gm-Message-State: AOJu0YyMVdNFBEM4N7lGIVd1XwmDJilcD12aLyXnWw4HSCiuxcPNA1i/ NvtENp7rTvtkiK1Ew2WPhUbNKJx0SuxVyPFERMKcjZvOkEyO/HZx X-Google-Smtp-Source: AGHT+IFePFkyKiIgr14J6vBqn1b+ByqP2t1FUvAt8NYPhCOSNPA9gjYYXws+wf2Pmi2exvLjEIk3qQ== X-Received: by 2002:a2e:924b:0:b0:2d8:5b34:b9ab with SMTP id v11-20020a2e924b000000b002d85b34b9abmr975979ljg.34.1712308931649; Fri, 05 Apr 2024 02:22:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:864f:0:b0:2d8:3d7a:f004 with SMTP id i15-20020a2e864f000000b002d83d7af004ls582232ljj.1.-pod-prod-05-eu; Fri, 05 Apr 2024 02:22:09 -0700 (PDT) X-Received: by 2002:a05:651c:153:b0:2d8:3ccc:60e8 with SMTP id c19-20020a05651c015300b002d83ccc60e8mr993274ljd.48.1712308929149; Fri, 05 Apr 2024 02:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712308929; cv=none; d=google.com; s=arc-20160816; b=tBp0NFkilM4gr6Lhb0IKZtZYFskJ1ZaWFqxRHsCXQ7wVpo6yZrN+s+oz8I3DakMn/y nzSUtaqOY2Nwg2sMKBkojFLpQ7aDCmv5YV4cOoEIwqzabFm5tr19M0JRfxwpjKeAJYrG Z16eoWobKcOC4gCNAeH6NBx9RhBTKcCS5JkX8fL2Y1LofdZ8l50DIGlOuiPjYhybzj6r M1eS+gFxAXNMsILhXKFOmHjEPv8F/OfKswI4BKNCVJ86IHFFdWalkOMqeCt6VgNwxk81 6z9nRWEzh+HK+682kfM4CwiUf1BUrJe/ff9RjLNm7W2wWWBwjhkW0OYF+VxEjyDw9ePQ oBJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=x9fyJQk89wcNPV7bOSBU3ZNdXuw0TxU7Z8Nfk1BeMtM=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=l7/sLKm4ZcAg5mdYbvpaKI89MeAMG7CHHvooEdtCPatJaiT8WCxz0+BUuw+fz5LEq1 OAVDdSsjXKam8XbiwJJKNKpEWFn7xl7KyeXwguCWEUfo5myABv9cEiUEJ1fRo0dVUD1w U5Ci9ArMHOxxiOY31SNvFfzbb8yrOGCiIT5/wt6TQ0xDNKZpmqLQgg/xIfFxOgChcqTu a3PeSHKDuo1TS0zb1Hf6wUmr7BKJ5yu/6uCE6ECGZCukFxj4SebEflsTB/o1DapvC2Of HGqHwl3Wp1nITI0MgPQbX0g2GLE5HkmX4ou10ZNwZ7kFYDig9qAQcBoyvIrUK589tPmS fs3A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id l4-20020a2e7004000000b002d6d437f3f9si29861ljc.5.2024.04.05.02.22.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2024 02:22:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.promwad.com (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4359M7kF000959 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 5 Apr 2024 11:22:07 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] kas: Support meta-test layer Date: Fri, 5 Apr 2024 12:21:40 +0300 Message-ID: <20240405092202.12879-1-ubely@ilbers.de> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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?= Add meta-test layer packages and images to kas menu configuration. Signed-off-by: Uladzimir Bely --- kas/image/Kconfig | 9 +++++++++ kas/image/isar-image-ci.yaml | 7 +++++++ kas/isar.yaml | 5 +++-- kas/package/Kconfig | 13 +++++++++++-- kas/package/pkg_isar-ci-ssh-setup.yaml | 9 +++++++++ .../images/isar-image-ci.bb | 0 scripts/generate_yaml.sh | 2 +- 7 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 kas/image/isar-image-ci.yaml create mode 100644 kas/package/pkg_isar-ci-ssh-setup.yaml rename meta-test/{recipes-ci => recipes-core}/images/isar-image-ci.bb (100%) diff --git a/kas/image/Kconfig b/kas/image/Kconfig index bc789064..45611c4e 100644 --- a/kas/image/Kconfig +++ b/kas/image/Kconfig @@ -22,6 +22,14 @@ config IMAGE_DEBUG help This image includes some tools preinstalled useful for debug. +config IMAGE_CI + bool "CI image" + select PACKAGE_SSHD_REGEN_KEYS + select PACKAGE_ISAR_CI_SSH_SETUP + help + This image includes is for running CI. Via isar-ci-ssh-setup recipe. + It creates ci user with non-interactive ssh access to the board. + menuconfig IMAGE_INSTALLER bool "Installer image" help @@ -44,6 +52,7 @@ config KAS_INCLUDE_IMAGE string default "kas/image/isar-image-base.yaml" if IMAGE_BASE default "kas/image/isar-image-debug.yaml" if IMAGE_DEBUG + default "kas/image/isar-image-ci.yaml" if IMAGE_CI default "kas/image/isar-image-installer.yaml" if IMAGE_INSTALLER endmenu diff --git a/kas/image/isar-image-ci.yaml b/kas/image/isar-image-ci.yaml new file mode 100644 index 00000000..20c381b5 --- /dev/null +++ b/kas/image/isar-image-ci.yaml @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +header: + version: 14 + +target: isar-image-ci diff --git a/kas/isar.yaml b/kas/isar.yaml index df26b780..16ce8b42 100644 --- a/kas/isar.yaml +++ b/kas/isar.yaml @@ -1,5 +1,5 @@ -# This software is a part of ISAR. -# Copyright (C) 2023 ilbers GmbH +# This software is a part of Isar. +# Copyright (C) 2023-2024 ilbers GmbH header: version: 14 @@ -11,6 +11,7 @@ repos: layers: meta: meta-isar: + meta-test: bblayers_conf_header: standard: | diff --git a/kas/package/Kconfig b/kas/package/Kconfig index af4c5137..35ba7cf1 100644 --- a/kas/package/Kconfig +++ b/kas/package/Kconfig @@ -1,5 +1,5 @@ -# This software is a part of ISAR. -# Copyright (C) 2023 ilbers GmbH +# This software is a part of Isar. +# Copyright (C) 2023-2024 ilbers GmbH # # Authors: # Uladzimir Bely @@ -137,6 +137,15 @@ config KAS_INCLUDE_PACKAGE_SSHD_REGEN_KEYS default "kas/package/pkg_sshd-regen-keys.yaml" depends on PACKAGE_SSHD_REGEN_KEYS +config PACKAGE_ISAR_CI_SSH_SETUP + bool "isar-ci-ssh-setup" + default n + +config KAS_INCLUDE_PACKAGE_ISAR_CI_SSH_SETUP + string + default "kas/package/pkg_sshd-regen-keys.yaml" + depends on PACKAGE_ISAR_CI_SSH_SETUP + endmenu config KAS_IMAGE_PREINSTALL diff --git a/kas/package/pkg_isar-ci-ssh-setup.yaml b/kas/package/pkg_isar-ci-ssh-setup.yaml new file mode 100644 index 00000000..bf771b63 --- /dev/null +++ b/kas/package/pkg_isar-ci-ssh-setup.yaml @@ -0,0 +1,9 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +header: + version: 14 + +local_conf_header: + package-isar-ci-ssh-setup: | + IMAGE_INSTALL:append = " isar-ci-ssh-setup" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-core/images/isar-image-ci.bb similarity index 100% rename from meta-test/recipes-ci/images/isar-image-ci.bb rename to meta-test/recipes-core/images/isar-image-ci.bb diff --git a/scripts/generate_yaml.sh b/scripts/generate_yaml.sh index 8e8651a0..aaa8bcba 100755 --- a/scripts/generate_yaml.sh +++ b/scripts/generate_yaml.sh @@ -78,7 +78,7 @@ done # Scan for image recipes, except: # - "isar-image-installer" having more complex structure -IMAGES=$(find {meta,meta-isar}/recipes-core/images -iname *.bb -printf "%f\n" \ +IMAGES=$(find {meta,meta-isar,meta-test}/recipes-core/images -iname *.bb -printf "%f\n" \ | sed -e 's/.bb$//' | grep -v "isar-image-installer"| sort) for image in ${IMAGES}