From patchwork Thu Jan 27 17:12:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12727105 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1DDFC43217 for ; Thu, 27 Jan 2022 17:13:01 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (EUR03-VE1-obe.outbound.protection.outlook.com [40.107.5.64]) by mx.groups.io with SMTP id smtpd.web08.658.1643303580152334181 for ; Thu, 27 Jan 2022 09:13:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=smyh6zN1; spf=pass (domain: siemens.com, ip: 40.107.5.64, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LAD4rPM1YdoPAhdW6AdNrv/vokF+fWpWWYP3Xeg5f4YS7quHLMA2BLvUr30S9XQD80Z9C8u5IzvC4wqB4raGBkLKXvXPTrGJmLeZ0nxaERfEzMNqwAyTDatdrAyWwu4ME05f44iY6zFFJf0LO1dJvx3RDXzhxEjOu/HLkw4dlvc5FeM6r2lkfsDtRb9CUA73Tc+WfSl47EdTQe8opH442u4GEWF2oCB1shw+S3fvempYzV7Kk2LLhiovwXW2KQc5YMRAEzwFlnWRWX5xynbygJb6cr0YzwpuwIFI0aQ9G797lkPPL75fdZFY4qBRAu3DjonIUvrQ5rTTDPPT4NIfUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=npiVpDzPZTWZGRHxpAle3dWFjj9AsRudTvkprQehOLk=; b=NnRJGKnGETTKkmfnOjC1tbj8MsQ2CX7alFLOckMRbmajesZ3opYJaC/rDpedQAzbPgPhJWV5kCqnZotXM6nhzbX5moRPAa583NnUX7MdcehS6gr0cFXP58DBZhkP+LMF4hjM7uVUhrN5368hm72Ql3XFR9zCzKP5MYwDz9cgsNhIaGg5WgEZCNtjtYvDuGmBC1nI6US9Y462gtm6zd7UAr6RDg9lG5WUad66AGOdV00z3brxSMwT06zaeLpXJ7Bw7zYs2aB90JUtUewGm7cgBD8mxwObBac7NSWfhfFvbpOafm6vohx0WYXh575ImmsJYlfQsstF8ZhlBw4WPNPDVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=npiVpDzPZTWZGRHxpAle3dWFjj9AsRudTvkprQehOLk=; b=smyh6zN1Ak8+1/73IORaeBsNU/Ke3vIv/sXQfODV9aBSjEQlaCnS7tJP3bg2BHYnXvEuqGKbWwcjktAD0w5Gz6u2zHfH+ar/Of5sp93ivc4AcJRDuXBKstVeMEm2foBvdVxqPZpf1lAEut/31N3B6QRa+cm5w0ye+ikbdEkQQKnuu1M4JQqI5osID3Bukgwl/nGxOkFlqXIC7xZa/e7jDLHvr7R0HjQ5d0CBYz0QWM3sj1Z3E01/NtRWrtCIxmndkFp4IeXsrSGpkPOTkPbADeaNE+hMy8wmHfpSb9j9vBrtMdjD6nMyrVM7ev4Y4Birv+xQ6plyPeKOfmp6j2ia6g== Received: from OL1P279CA0048.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:14::17) by VI1PR10MB2670.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.12; Thu, 27 Jan 2022 17:12:56 +0000 Received: from HE1EUR01FT027.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:14:cafe::1) by OL1P279CA0048.outlook.office365.com (2603:10a6:e10:14::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:12:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT027.mail.protection.outlook.com (10.152.0.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:12:55 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 27 Jan 2022 18:12:55 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.73.11) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 27 Jan 2022 18:12:55 +0100 From: Jan Kiszka To: CC: Alice Ferrazzi Subject: [isar-cip-core][PATCH v3 1/6] Add cip-core-image-kernelci Date: Thu, 27 Jan 2022 18:12:38 +0100 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.73.11] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94277967-d6a2-4039-df0d-08d9e1b842c5 X-MS-TrafficTypeDiagnostic: VI1PR10MB2670:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GRxaFnVmk6JJrwwJ/qUsMWCF+NPdn4hoC+hZ1DPzFxV0X5Q5DNkH2yMA7uqt1KQxwLE7Qvcq9kjaQ4WwqPlxP8er5+0XUVeASbmqyHgsF3vtf/vl3fZomnipA47S3crBqqTulpTcYp9oB6AymgwM1oGeXVIMOSjNpDyXn5Q/PT/9zywUJ7V75iTA1qFdZ/oAEfQlRVK4331Onmje1AE3eCWD9Dty+WSQlWvZl10jwZ+Hx5MzCObgZSLswAaNOjZUJNDIGInkEluWLHcKeRifxlCVzLBNBlwJivjibHxzalgbM5IufrpI1wXhRMv+LaG2F9p6DczSmid0/OYJQspa76422hJk9nOt0c8vCN+TJfRQtK/o1ODBsOhxKTJqbzw9Rdd24sSM1bjgGUBkVf5SY8KODj3IeIzcp3gr1vdrxS1u0m+CT6qaft9Iv9/5ciNm/dA7/plrUwDk0Zh8DCPeW43y3SD0t8v9B4eFXsMVXCskz7xOBr3v1wrzVrDoW5HojmhWksF0EzjssmqCd9k2PpFNGG8gwCYZFBibHh9vFbUm8D7fxlmOK/n3V5z35IUf8eYNrrflHzcTA5RMUx2g1Qwq0aXUBVvhcbR5TReWOL3TjIqGKgkK0UaxMCMO7aCjHLdqg/zMWDYJ/DXsOxNomZSADdvoZ1zJ07GHJFaEb12CsRD4Um5OaFcXSZTCOTaiegTh/DfeTc+chv/RvXbkm4Z4LmKooU9ULsi5x+EeX2YQuHLlkpnDFzXu5Gn4XrYGyuOcAnnqqzuloiVN28OMJtknwgreTUNTsNAE8eAHzsM= X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(40470700004)(46966006)(70206006)(186003)(8936002)(5660300002)(6666004)(70586007)(81166007)(16526019)(6916009)(86362001)(82310400004)(2616005)(316002)(82960400001)(44832011)(26005)(4326008)(356005)(47076005)(40460700003)(8676002)(508600001)(36756003)(336012)(2906002)(83380400001)(36860700001)(956004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 17:12:55.9351 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94277967-d6a2-4039-df0d-08d9e1b842c5 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT027.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2670 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jan 2022 17:13:01 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7512 From: Alice Ferrazzi This image is currently used by KernelCI production for testing purpose. The purpose of this image is that KernelCI need to be able to autologin without password and to detect the login shell using special characters. Currently added are the default settings used by KernelCI images. Signed-off-by: Alice Ferrazzi Signed-off-by: Jan Kiszka --- kas/opt/kernelci.yml | 16 +++++++++ .../images/cip-core-image-kernelci.bb | 16 +++++++++ .../files/99-silent-printk.conf | 1 + .../kernelci-customizations/files/ethernet | 23 +++++++++++++ .../kernelci-customizations/files/postinst | 34 +++++++++++++++++++ .../kernelci-customizations.bb | 34 +++++++++++++++++++ 6 files changed, 124 insertions(+) create mode 100644 kas/opt/kernelci.yml create mode 100644 recipes-core/images/cip-core-image-kernelci.bb create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf create mode 100644 recipes-core/kernelci-customizations/files/ethernet create mode 100644 recipes-core/kernelci-customizations/files/postinst create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb diff --git a/kas/opt/kernelci.yml b/kas/opt/kernelci.yml new file mode 100644 index 0000000..9c67864 --- /dev/null +++ b/kas/opt/kernelci.yml @@ -0,0 +1,16 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Toshiba Corporation, 2020 +# Copyright (c) Cybertrust Japan Co., Ltd., 2021 +# +# Authors: +# Venkata Pyla +# Alice Ferrazzi +# +# SPDX-License-Identifier: MIT +# +header: + version: 10 + +target: cip-core-image-kernelci diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb new file mode 100644 index 0000000..479c14c --- /dev/null +++ b/recipes-core/images/cip-core-image-kernelci.bb @@ -0,0 +1,16 @@ +# +# A reference image for KernelCI +# +# Copyright (c) Cybertrust Japan Co., Ltd., 2021 +# +# Authors: +# Alice Ferrazzi +# +# SPDX-License-Identifier: MIT +# + +inherit image + +DESCRIPTION = "CIP Core image for KernelCI" + +IMAGE_INSTALL += "kernelci-customizations" diff --git a/recipes-core/kernelci-customizations/files/99-silent-printk.conf b/recipes-core/kernelci-customizations/files/99-silent-printk.conf new file mode 100644 index 0000000..ad24d3a --- /dev/null +++ b/recipes-core/kernelci-customizations/files/99-silent-printk.conf @@ -0,0 +1 @@ +kernel.printk = 3 4 1 3 diff --git a/recipes-core/kernelci-customizations/files/ethernet b/recipes-core/kernelci-customizations/files/ethernet new file mode 100644 index 0000000..fa47d1a --- /dev/null +++ b/recipes-core/kernelci-customizations/files/ethernet @@ -0,0 +1,23 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + +allow-hotplug eth0 +allow-hotplug enp0s2 +allow-hotplug enp2s0 + +# used on BBB +iface eth0 inet dhcp + +# used on qemu-amd64 +iface enp0s2 inet dhcp + +# used on simatic-ipc227e +iface enp2s0 inet dhcp diff --git a/recipes-core/kernelci-customizations/files/postinst b/recipes-core/kernelci-customizations/files/postinst new file mode 100644 index 0000000..7ae30e8 --- /dev/null +++ b/recipes-core/kernelci-customizations/files/postinst @@ -0,0 +1,34 @@ +#!/bin/sh +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2019 +# Copyright (c) Cybertrust Japan Co., Ltd., 2021 +# +# Authors: +# Jan Kiszka +# Alice Ferrazzi +# +# SPDX-License-Identifier: MIT +# + +echo "CIP Core Demo & Test Image" > /etc/issue + +# permit root login without password +echo "PermitRootLogin yes" >> /etc/ssh/sshd_config +echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config +passwd root -d + +# serial getty service for autologin +mkdir -p /etc/systemd/system/serial-getty@.service.d/ +echo "[Service]" > /etc/systemd/system/serial-getty@.service.d/override.conf +echo "ExecStart=" >> /etc/systemd/system/serial-getty@.service.d/override.conf +echo "ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM" >> /etc/systemd/system/serial-getty@.service.d/override.conf + +# set the profile for KernelCI +echo "PS1='\$(pwd) # '" > /root/.profile +echo "cd /" >> /root/.profile + +HOSTNAME=demo +echo "$HOSTNAME" > /etc/hostname +echo "127.0.0.1 $HOSTNAME" >> /etc/hosts diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb new file mode 100644 index 0000000..dca0891 --- /dev/null +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb @@ -0,0 +1,34 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2019 +# Copyright (c) Cybertrust Japan Co., Ltd., 2021 +# +# Authors: +# Jan Kiszka +# Alice Ferrazzi +# +# SPDX-License-Identifier: MIT +# + +inherit dpkg-raw + +DESCRIPTION = "CIP Core image demo & customizations" + +SRC_URI = " \ + file://postinst \ + file://ethernet \ + file://99-silent-printk.conf" + +DEPENDS += "sshd-regen-keys" + +DEBIAN_DEPENDS = " \ + ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys" + +do_install() { + install -v -d ${D}/etc/network/interfaces.d + install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/ + + install -v -d ${D}/etc/sysctl.d + install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/ +} From patchwork Thu Jan 27 17:12:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12727103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C69E5C433EF for ; Thu, 27 Jan 2022 17:13:00 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (EUR03-VE1-obe.outbound.protection.outlook.com [40.107.5.53]) by mx.groups.io with SMTP id smtpd.web10.675.1643303579427979472 for ; Thu, 27 Jan 2022 09:13:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=Nf3CLqIu; spf=pass (domain: siemens.com, ip: 40.107.5.53, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SLvEn/sAVrETlfDmXmgbaYar4lwoVNi1/ZzA3YOokkFckDt91WJ6waA1NYt7wbWqh23tiaC2TzGKv5AiqYPxKIkRUn9cgSiJYZ6ZlssT2k9sPkyjbu/VuGuUlF/S4cE5WTAPtgBviAG15cKKO9str4sO6yhJPOjdjTmws2AQO+HO75i7T8fm8PE6xD+Dj7VCqamK/T8mPO6PvWQCY8FEwOClZE7F0W2Z6BilppZG2bctI9m/wqMb2vtHgAXdsCfBFXMDVs+DpLqbqBQY+XhOmIEhlCFxQRrufQIt7s1+20ccZpBS1vhnPG2HkhmiaZXXwK0Mzsl9AhwKT/p9UjthVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TmtYgXvjJr4lbJ9x3x23MucHOTCemPPbjVpr1BkEfOc=; b=V42GNT3RlW8B4+PfFbvTXHLvGgmU0hvrJ2xc6SiXPt135YfkjLXLYcar46xX7ADwilllnTWmBIqrylIncchj6LQr0qjAzACCTvSoZfPpKFlPEv1KapB1MIqs+KyxYpPz2Kd9yTZEnYnm1NADZl5RKxXYHwvJiIvKib62x/KF/FvLWSRDoujgqEQrS0HBT2KNtLQb8BNnmHVvDzDJ54pSLdZ+Q0x0y8S8T1iy/6SFerW3ZXrMgS/IoVzCwpmguE1wRBQQrRYS5U5S4onEFIQWbEbyJaDUomrIGYZ7SksWpiiXuThJetFUL5dw5w4WtUJzNlisohXK0U+6U6uu84llCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TmtYgXvjJr4lbJ9x3x23MucHOTCemPPbjVpr1BkEfOc=; b=Nf3CLqIugTV0ecndJ2UoS7OtpeqZx+jRcn4iYwj8q061norkeLUedK6Dt9UHLCvCuc8alGcPjftzXQ9Edsk4jyyqDSzQ+mTqW0oxzVHW11K5GQVuomgYW9XjUIorYYts6g5UmT1o4dCZfajYXZ9KNeaCV5ut5O7lN1t4Wc4Ip9ORJr5zbioyhP2sLmzPu9uWpNDu59OP5gQ3tXuoZffFdq3ld2enqe5hxlWSjqrQ0/6jtCWS2JW8WglK4YOQGoXz8mtbET1SlEGEMGZkSyXo0sQNEh1pY/h5Me9n9+5/Je2Widtt52HmJi8TSJ+T5zHbyLqzXpHt78x+BzepU8zC8g== Received: from DU2PR04CA0273.eurprd04.prod.outlook.com (2603:10a6:10:28c::8) by DB9PR10MB4877.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:2c5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Thu, 27 Jan 2022 17:12:56 +0000 Received: from DB5EUR01FT037.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:28c:cafe::2d) by DU2PR04CA0273.outlook.office365.com (2603:10a6:10:28c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17 via Frontend Transport; Thu, 27 Jan 2022 17:12:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by DB5EUR01FT037.mail.protection.outlook.com (10.152.4.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:12:56 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 27 Jan 2022 18:12:55 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.73.11) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 27 Jan 2022 18:12:55 +0100 From: Jan Kiszka To: CC: Alice Ferrazzi Subject: [isar-cip-core][PATCH v3 2/6] Add dmesg filter needed for lava test result Date: Thu, 27 Jan 2022 18:12:39 +0100 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.73.11] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc6903a4-6c0a-4f65-9510-08d9e1b842e4 X-MS-TrafficTypeDiagnostic: DB9PR10MB4877:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kdnzhZbTevv7X6KPzI47iuzBMhDrG1uMrdiWUaW6qt4yksBGVAximtxu9VIJYk63C44zicXyoS3O5QdL8Fs3litQj+CF1Pu30AI8sfyUDbNK3Tgb8O/2ueYe/30TMPBkwSt3NRUiVr/7IL67u/uTMz6Zc8jR6wm4ulIAkC15WzbzSEejrJVEIRp6EnmA+eOMJLwSNQEs47PfmETYcm74Nc0lB4vTuUt2yVieLsuaF5H3vOOUgerLBdqt+9yifnZjMbP/Y8gqK0nABKLsqSK3eclojh+1NNSv3McpQNhSuMExlwo7rzEkxRT8tTNDwoE/pRICA0NDUWz9vkcL6X0Ti8PIH5Ubh7MAjmNo6Nfcv/yFyPJ9tI5pAgTOKnG940T00FsXNF0pAJLuNRsLwASp0AZwO1r+Yf67bHmpdleIUi59Am2+8YbqLpd0uOVnvs5hySBw/5mmRoTbyZ33Jw8KwVvjkcn3MCo1dF2mbLaXl1VDtmwbV4i1FS1RPZy2oGFMb1umPBZLAvVdssYWf/Gs1olZK0WTdhYTSNAFVhnIWhI8HihRVeV2oevehzjRFwhblEmEiHTN7BVuhRWdT/wwW25+f1dzOZ6WXKo2EteNAGzxhYLYDQV0K06A9pSMqiNfmbVYZIgrtTtqKn6v4EIEcHeswHf7E6ps148OgJS99pT+iZE2rBDp6ZLLG4TM0/dx4Kh2zYuzBAPVfEqSdKQfwg== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(336012)(356005)(81166007)(36756003)(36860700001)(40460700003)(47076005)(5660300002)(44832011)(2906002)(508600001)(83380400001)(82960400001)(16526019)(86362001)(6916009)(70586007)(70206006)(4326008)(6666004)(8676002)(8936002)(82310400004)(2616005)(186003)(26005)(956004)(316002)(36900700001)(20210929001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 17:12:56.1363 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc6903a4-6c0a-4f65-9510-08d9e1b842e4 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT037.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB4877 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jan 2022 17:13:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7511 From: Alice Ferrazzi KernelCI is using a dmesg filter script for checking dmesg logs result with lava. Adding the script to the cip-core-image-kernelci. Signed-off-by: Alice Ferrazzi [Jan: restore actual installation] Signed-off-by: Jan Kiszka --- .../kernelci-customizations/files/dmesg.sh | 23 +++++++++++++++++++ .../kernelci-customizations.bb | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh diff --git a/recipes-core/kernelci-customizations/files/dmesg.sh b/recipes-core/kernelci-customizations/files/dmesg.sh new file mode 100644 index 0000000..3b096e1 --- /dev/null +++ b/recipes-core/kernelci-customizations/files/dmesg.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +if [ "$KERNELCI_LAVA" = "y" ]; then + alias test-result='lava-test-case' +else + alias test-result='echo' +fi + +for level in crit alert emerg; do + dmesg --level=$level --notime -x -k > dmesg.$level + test -s dmesg.$level && res=fail || res=pass + count=$(cat dmesg.$level | wc -l) + cat dmesg.$level + test-result \ + $level \ + --result $res \ + --measurement $count \ + --units lines +done + +exit 0 diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb index dca0891..df4257c 100644 --- a/recipes-core/kernelci-customizations/kernelci-customizations.bb +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb @@ -18,6 +18,7 @@ DESCRIPTION = "CIP Core image demo & customizations" SRC_URI = " \ file://postinst \ file://ethernet \ + file://dmesg.sh \ file://99-silent-printk.conf" DEPENDS += "sshd-regen-keys" @@ -31,4 +32,7 @@ do_install() { install -v -d ${D}/etc/sysctl.d install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/ + + install -v -d ${D}/opt/kernelci + install -v -m 744 ${WORKDIR}/dmesg.sh ${D}/opt/kernelci/ } From patchwork Thu Jan 27 17:12:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12727104 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 061DCC4332F for ; Thu, 27 Jan 2022 17:13:01 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.84]) by mx.groups.io with SMTP id smtpd.web08.655.1643303579508093796 for ; Thu, 27 Jan 2022 09:13:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=wdJnU6MS; spf=pass (domain: siemens.com, ip: 40.107.15.84, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SaPnBMc189OmrjHOM9LP0HwnGzOn1V3Y0vNySsrJarU7fVcjijfAa91ZPLTWxP8ojRW1u6rVum3CBfbVPWfHuqM9Yvj4Z99w6kwA1+xUSaC5gRQAOA6P5ezwuxkg1EuK9ucsj50RbqnJR3kxYV4BFN1JXZZmTt9fiWMH3+nASDUpM0KF7uQvi6lRqi+35FeleImwZJi6XXZ1HSVdIve4bv3TczS1a9xisPaZvgXxIMb5OtOa9wRpt1e9Tn9E8LBi5u8kgSFacwra3ax0np8FUnngVfAx0HRh0OUcctKFKK+OXiYQX9CgUM3dys+trUXWVTm/zg24KGgd9J1ECZ51Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YfsJobPRUyF+gqmZpHPjqeKeAWAoaO43xGqni93UkQU=; b=XMFuhvVdKIBSikhCJnTva49OjXG6D4EFdfbiujuKNTykILGBU+19nqXlqLT2t2tlxpfw5PqTAYSD3rfkv+RhsGKH8THlbm03NsXDPW+gXb2c3s5LlgBFnRYzUWG6PjIjAFfcRd52d4rS2B84ExQDJRnJOTZqDoYzFTmtXBJPCD964X9gtDlPkGdQT5wGIkJ4Anou2OKuZNHYv4kbHsV7rIAIsH+2Ys6uVgevfYcGGU2LEaIuEmQjxeKWOfrAGMx9Y6cum5L27Zjza6V6qOHyTQsYJ/eiL+ldE9/Z0ufvC9LbZejNVhC8QG/p2ZekdBInj1NDKVSAcRrknoiJG58jvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YfsJobPRUyF+gqmZpHPjqeKeAWAoaO43xGqni93UkQU=; b=wdJnU6MSEaxbhjoNmG1ozU5u4y8dfwOwJr6iNQJLxTdJGdk4Qe7OuWRw+aaH52LwgyUTIaieJttDcBh0W/U/0p5O6xUaIjk5xC86ImL17c/+bxk5l0yfjVKkvneI6Ksj+wynh80ATPc0b5hNVXUjM1jimkJOehT5leTOvCo3wJXqfzBBw80snadFTCq+V7DDSu7E/O5tgBCnr/KE0vG5VgZCbDuFMBL3NCDObrMg4FZIDd1sdCMVhleCqA2L0maQJy+cQwaV1uJ9lzKDVByLuJcfs2aXK7EqF3c+dx3mJMzk4EMPQ3FTYhgobrZMJo/BYQMhSGX1yhP8npQhLEsBUw== Received: from SV0P279CA0035.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:12::22) by AM9PR10MB5082.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:435::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Thu, 27 Jan 2022 17:12:57 +0000 Received: from HE1EUR01FT022.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:12:cafe::64) by SV0P279CA0035.outlook.office365.com (2603:10a6:f10:12::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:12:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by HE1EUR01FT022.mail.protection.outlook.com (10.152.0.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:12:56 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 27 Jan 2022 18:12:55 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.73.11) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 27 Jan 2022 18:12:55 +0100 From: Jan Kiszka To: CC: Alice Ferrazzi Subject: [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci Date: Thu, 27 Jan 2022 18:12:40 +0100 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.73.11] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: effc0a1f-5e03-49c2-3826-08d9e1b84319 X-MS-TrafficTypeDiagnostic: AM9PR10MB5082:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ApZtGF6A6RIXcOfadEYQWef9v39beiJ/MUd2n8mQLpouzEeCbPiGgzNpVOGR4NIuFys6jisRzP/s/okan2Kz6QpQM7p25zja0YCE+YJzogMjC8QyhutIH682/4OFgwD1JUtCBzTLqvfdseH3AfIqmgEIymaG2dViKsa+xNaaftb5lGNqtsl4/3hSId3rqeS/x35lC8bJM0tKivuZFdDUHP0LPk58QS1sdYaNV+sk27dAoJI/MQHXbhZ7swVbCAUKPUhc0R47iQ/WITEOEDFi/CBmxbh4cC3C80WJfa8MYQX6cR7FqtyPkg0K4MTLQghsIUxMgkwS9IBu4i9wukBMcf66GWgbX7Lf9c9pkGCR6S1enwb+Jpr0bqi41/9U6ynuR2wlQopDgRfABD55bsPrOFo2KDcjYXG+S7+kyv7r3YV9Ghq65xuR7U7utCZ2PORsrhv9lmYRDYV4GmeXP3sFkV65mB2R9ODoKv8bxvwSmZ9z0uacb3nLlEqXm66+MtLYidp62YXWjNBsjPh6P+BX+SjGZbjWls0FHQwbsS640VQk4G/UCm1yGIjTCf7ZWcILEogueICLBtr/WxA8+xiMVxjUr19Xe0GG1/uLHBgTVE+2pHRkBGLMtnr3OC9OrBKyJGDUp/4jp63A7bj7y+CTjqyaTdiXH3q2/F9IX1JN/Bh24hgg0MA786C+qBG7KBQf4GJ2cdBA+Pjh4YYqaY4CyQqx7vh3WpDMV0hZvW6JP+WhyxsHij1uaZ8zL5w9L7TSod1gwUrEze4bN7IRwFx0f9aKqsUQ4NSTSWPn+jCOw9k= X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(6666004)(186003)(2906002)(508600001)(966005)(336012)(2616005)(956004)(44832011)(8936002)(8676002)(4326008)(16526019)(47076005)(83380400001)(36756003)(86362001)(26005)(40460700003)(316002)(6916009)(82960400001)(70206006)(82310400004)(70586007)(36860700001)(5660300002)(356005)(81166007)(36900700001)(20210929001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 17:12:56.4656 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: effc0a1f-5e03-49c2-3826-08d9e1b84319 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT022.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB5082 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jan 2022 17:13:01 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7509 From: Alice Ferrazzi The cip-core-image-kernelci need to be uploaded to the KernelCI production storage for been used by KernelCI. This script use the KernelCI API for uploading the cip-core-image-kernelci to the production storage. The images are uploaded in the following link: https://storage.kernelci.org/images/rootfs/cip/ Signed-off-by: Alice Ferrazzi Signed-off-by: Jan Kiszka --- scripts/deploy-kernelci.py | 55 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 scripts/deploy-kernelci.py diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py new file mode 100755 index 0000000..5a8adca --- /dev/null +++ b/scripts/deploy-kernelci.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import subprocess +import requests +import os +import sys +import time +from urllib.parse import urljoin + +cdate=time.strftime("%Y%m%d") +api="https://api.kernelci.org/upload" +token=os.getenv("KERNELCI_TOKEN") + +release=sys.argv[1] +target=sys.argv[2] +extension=sys.argv[3] + +rootfs_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+".tar.gz" +initrd_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+"-initrd.img" +initrd_gz_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+"-initrd.img.gz" + +input_dir="build/tmp/deploy/images/"+target +upload_path="/images/rootfs/cip/"+cdate+"/"+target+"/" +upload_path_latest="/images/rootfs/cip/latest/"+target+"/" +rootfs=input_dir+"/"+rootfs_filename +initrd=input_dir+"/"+initrd_filename + +def upload_file(api, token, path, input_file, input_filename): + headers = { + 'Authorization': token, + } + data = { + 'path': path, + } + files = { + 'file': (input_filename, open(input_file, 'rb').read()), + } + url = urljoin(api, 'upload') + resp = requests.post(url, headers=headers, data=data, files=files) + resp.raise_for_status() + +if os.path.exists(rootfs) and os.path.exists(initrd): + print("uploading rootfs to KernelCI") + upload_file(api, token, upload_path, rootfs, rootfs_filename) + print("uploading initrd to KernelCI") + upload_file(api, token, upload_path, initrd, initrd_gz_filename) + print("uploaded to: https://storage.kernelci.org"+upload_path) + + # Upload latest + print("uploading rootfs to KernelCI CIP latest") + upload_file(api, token, upload_path_latest, rootfs, rootfs_filename) + print("uploading initrd to KernelCI CIP latest") + upload_file(api, token, upload_path_latest, initrd, initrd_gz_filename) + print("uploaded to: https://storage.kernelci.org"+upload_path_latest) From patchwork Thu Jan 27 17:12:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12727106 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE911C433FE for ; Thu, 27 Jan 2022 17:13:00 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (EUR03-AM5-obe.outbound.protection.outlook.com [40.107.3.89]) by mx.groups.io with SMTP id smtpd.web08.656.1643303579638070388 for ; Thu, 27 Jan 2022 09:13:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=fIggF6Uv; spf=pass (domain: siemens.com, ip: 40.107.3.89, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CSBA5XLA73nCDu5wJBLk2wfuMZMqVXuqbzpCIDyt6Lx4bMKoJo9x0sDQPnniCC5oX4mG+0xu/Qn2vjQg04LtYFjgOVqD4iycPU0ORDhR1BfUjlvLao1zMlY61o9YoCsk1414gq5l14D9kmPyEN6s9mrwU3s9PfkbXSO95XF9RILHNcBW6/gCZ6nENZ7nUyJuxacgW1sbEIhjK+GOh7KM1wKgmfC/1p2ahNFOs/S7UZLEuqw5NyWi4K9cIM1B39t+kIPsEAT1qNowhJTeD9IIJR/bRJRt9IdqOdIB1/DBoWNPLXpR7ArNILwNz3ZST/KxhSzTB8c/uFyzX+z0gO6QQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n8UFUo4x4rZCqsowgnspJBE/mF5b8XxZ29HA7Fy/lec=; b=CQw5k1n9wg9vbnzdfR5NPeX23hlumJ3WjKY1JZrpSqa/vGl41JmJMy31YnnKCsqUszF9M8uTwJj6itwssGUsYqwHTbJk+ZNYQYfUYB/izNqcOKGPL+GjP1vulw3W6N0CzcGRhF+mv0MDQpABoteaIk7QnuwYM3EV1kLdcYyMpUfd3d9NcHYU3/eu94DAuUS//vAeegE+E+wg7YgGNyKu4KC503AjQr6XEa3fGeg731COb92RPIoZrMi1ay07QkfHvlt1U4cDNQAhQ3mEnUiVAP3I+0tTOJUoiBn4Kw+/w2tH6+lipeUiNdbt2jhTIAXQihlSdg7nvF6WXHXQn2k9fg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n8UFUo4x4rZCqsowgnspJBE/mF5b8XxZ29HA7Fy/lec=; b=fIggF6UvVsEfejsqhC0ZWCOVV2g/rzp29giNbGfPu4nSE6zTurtKJdlt0YKv8FYZo7unNO3X6v6z3yBAjGMZtxIoxcKlDZfnT8Sp9oWpTo3Q4bkKfzUhbUnpTqon7RSF1VPfx8OKmsouGdi8BoAJq7BvszcFfv8xby9M3z1IUQ2OTVedXzeyT8jhCaxRzbvxEFQDVerKBHwKwuW6nNgsTd3C1YFdZS3ecyWyDDWoiU6l0Wg4H3sERb5FYqPyLcZiCVKPK5R+H7zSu9Br7GOMM4ptIqecIaF3SI24ar3xXQuZI+JGdXWDgTkySv6a+e8nyBhXwBTLdYQMxCAUPHKrRA== Received: from DU2PR04CA0048.eurprd04.prod.outlook.com (2603:10a6:10:234::23) by AM4PR1001MB1363.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:200:99::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.13; Thu, 27 Jan 2022 17:12:57 +0000 Received: from DB5EUR01FT015.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:234:cafe::2c) by DU2PR04CA0048.outlook.office365.com (2603:10a6:10:234::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:12:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by DB5EUR01FT015.mail.protection.outlook.com (10.152.5.0) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:12:56 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 27 Jan 2022 18:12:56 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.73.11) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 27 Jan 2022 18:12:55 +0100 From: Jan Kiszka To: CC: Alice Ferrazzi Subject: [isar-cip-core][PATCH v3 4/6] enable cip-core-image-kernelci Date: Thu, 27 Jan 2022 18:12:41 +0100 Message-ID: <9f00d50ebfcdd3cebba57431d6c98952f6344fbf.1643303563.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.73.11] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88959f65-6348-4f2e-1d29-08d9e1b84329 X-MS-TrafficTypeDiagnostic: AM4PR1001MB1363:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: obVxLUNAVMpRmlPyiLrQQPNSKJGQnlaCadUKq4Z9ERlDTGsOOtZpqMZpbykq9SyLqHoS0sNj0KlRL1G9uYhBs75NDjKJfsH++J6TCSXkcqcDVGq1jsAxlYwUFFg8jExFDXGFs6G88j6oQB0TTmB4Y6kosGpsiKJoUX5nioVhLz/eaapP0euW6bHyI5AAhXdWsYDM/8igov+vuHhEf7J2yPJfgWXyw7dIbsfzp9HBvSiBfqn2cVkVv/qSg8xIuj7f6UMb/bMUJF3D/Dc8ZwYuJh96Nsx6vpjxr0zJOl/YN60U1zIXoEnjqB1HSZlhhYyS6lhM5SfAExZ0+NYkJpnuEorcidnTNkfbFBxMowpInFv9q8Cu+TEmj0mBTo3oXVy6a/yBb9ffiovskiHSgoVj7ZJvYLGJP1ohmu76Pv4c3z4+JzcmGSXAoIRG86+zoxkUU3JXajoMkrfFsXZ9Y0xbfAhSSAv6asJ44HHqWGIYyWM1GNH2HRC4PrgBCRlI0J9/RF06FnaH0JYDNaeGs0n1l7O9g94xlx6kh6hNKDvNDrbtlxSzdPpEgxyxtiNydt38POIO/95J7sUqMesXbL2OPnAz/HAVsFq3dnanEava/voxlUa8glaPxELJ4daLKppnblM77wilFVFvZ/a6irRUtBX8oodciuDQA8KZShUAMZbFC8h2uhpE/QwFEn6OZyWg22G98ar/D+Moit39hSMSsGDWnias6ZFTD2PYTPf86gw+ytSW7dU+egd/A4TosqW0M83nx4X3KeTz+QDjFMOdyg== X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(46966006)(40470700004)(36840700001)(47076005)(86362001)(6666004)(956004)(316002)(70586007)(70206006)(7596003)(7636003)(2616005)(82310400004)(8676002)(4326008)(508600001)(36860700001)(40460700003)(8936002)(82960400001)(5660300002)(2906002)(44832011)(26005)(6916009)(356005)(336012)(36756003)(16526019)(186003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 17:12:56.5854 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88959f65-6348-4f2e-1d29-08d9e1b84329 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT015.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR1001MB1363 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jan 2022 17:13:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7510 From: Alice Ferrazzi enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64. Signed-off-by: Alice Ferrazzi Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9cbc60..c06c783 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ variables: targz: disable dtb: none deploy: enable + deploy_kernelci: disable stages: - build @@ -38,6 +39,7 @@ default: - echo "Building ${base_yaml}" - kas build ${base_yaml} - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi # base image build:simatic-ipc227e-base: @@ -77,6 +79,18 @@ build:qemu-amd64-base: wic_targz: disable targz: enable +build:qemu-amd64-base-kernelci: + extends: + - .build_base + variables: + target: qemu-amd64 + extension: kernelci + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + deploy_kernelci: enable + build:qemu-arm64-base: extends: - .build_base @@ -87,6 +101,18 @@ build:qemu-arm64-base: wic_targz: disable targz: enable +build:qemu-arm64-base-kernelci: + extends: + - .build_base + variables: + target: qemu-arm64 + extension: kernelci + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + deploy_kernelci: enable + build:qemu-arm-base: extends: - .build_base @@ -97,6 +123,18 @@ build:qemu-arm-base: wic_targz: disable targz: enable +build:qemu-arm-base-kernelci: + extends: + - .build_base + variables: + target: qemu-arm + extension: kernelci + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + deploy_kernelci: enable + # test build:simatic-ipc227e-test: extends: From patchwork Thu Jan 27 17:12:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12727108 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA889C433F5 for ; Thu, 27 Jan 2022 17:13:14 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.51]) by mx.groups.io with SMTP id smtpd.web08.667.1643303593617008214 for ; Thu, 27 Jan 2022 09:13:14 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=up80/lCP; spf=pass (domain: siemens.com, ip: 40.107.7.51, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j+ijtb8dlSypfHAxeWCH/+NyOmiCg4XQsyFr+bnliW4y4L1Q2s1t6E0wiSMPjGazdTJTjk3pubAc+A0WN65WfRQoZMFeA8Nn5dR62NQinlUf87W3w8EwT5mR9U1oTG216p5eDerLIw3Wb7LCmOrFM+zrf4maocvdnPxi53kBuQfd13rbCh14v6kX3g2jf69MfFMzhfCkFmzVr2s5DKesDt9qwT/eokHstnPj6ZnlDKkVHGBrAIldjViBVcPq9h21ms9h/nhvK0PpBmeYhgqUSjHU4qrvUqJlMLu3unLfyXOyNuDMa07pvbMh8QOZvGZYH/+p81etj9HCbqIRAb75dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1ZLkCAPrp2WkAK9+9lRwHHzidQTy6cG9THZR9ETBgcc=; b=d0D+5Wvae/n+hEazH6NF+EU+/sAZgBB09N4YoTWhzjcAnsaMbO/CTk2DAt3cEr+g+Bdya5tVHNcTzX3LXqkyvr91wPtF3DT5CN2y1I1IGOeZszdoaUiUiL3clxEZZhkwuLHMu0pNaGKyMISSR+Ojl0DTNSsVFnVSJZApj7TZ9HPg375Yz6VTNIhZhpcjX4M5c7eKUh8R5uuqmplZxRphmav5fT6egxNenqrv+2qWNSoRw7ZZHFwx+rq8/Vrjiu2CvFJbMSjstNrnw3bcLnT13YoFZhW/tgGAvKCX/tL6Ed0h3OLCC8Qw0tD/Yzl5UtsskkzPNc1q45kQEP+See8ekQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1ZLkCAPrp2WkAK9+9lRwHHzidQTy6cG9THZR9ETBgcc=; b=up80/lCP1gK8lXprahAPUklfbPLM60SpLuxJTbGxeBNa3C2eP2J3jODeRwq89R0EP8D+Cr3o/AFCI6ibdsPPyshXr62ps0DisuEG8CZYvIJz1TJZShz7+4i5EZOKxFrXSlHsmX7FU3ZUvB8gedHuhbj7A9qZS96e7DWZZ8rdIhzMknJmAKS1/1NuNbDcGcb2d0qjHhxZoQT1qw4MgZlJqqNmKJbk38Ks1vu0DNHJWL09oB9tWl0YwAl8x0iH4ZtIhw2hfC/3WUeyvQPxTeOgBokVfthcTO8gWxX1V16HkTWDyNzL6c6kNDJidb7IVe4oTg30V0UaDww6egjzKQFxJw== Received: from OL1P279CA0033.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:13::20) by AM0PR10MB3684.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:151::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Thu, 27 Jan 2022 17:13:10 +0000 Received: from HE1EUR01FT003.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:13:cafe::da) by OL1P279CA0033.outlook.office365.com (2603:10a6:e10:13::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:13:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT003.mail.protection.outlook.com (10.152.0.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:13:10 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 27 Jan 2022 18:13:09 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.73.11) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 27 Jan 2022 18:13:09 +0100 From: Jan Kiszka To: CC: Alice Ferrazzi Subject: [isar-cip-core][PATCH v3 5/6] customizations: Factor out a common.inc Date: Thu, 27 Jan 2022 18:12:42 +0100 Message-ID: <7f039c5d636de4d8d8e781dc384956c69e8d7716.1643303563.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.73.11] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e19d1e1-85e0-46e8-4123-08d9e1b84b60 X-MS-TrafficTypeDiagnostic: AM0PR10MB3684:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:669; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jBgQcOnKPC98OqrbkiJd8aAmJKwUoVSrY8tYPrv1hmqSpz0Lc6YlGi6cB6fVYdkkGcGMKEDHumra/ZBQiVpTJGqh4CD/VaCQNACO75DYvzROh3ZRQGjGnPz27VBG1yZ2/pMmtRVRy3PS3xJz7Udwn6ETuXMHYSLkW2uBhpP5IztFpfUR82GHBPPujJ8ZyHWgR2DvbZFT1Y4D2na3X9L2UBMC5U3ybytL8NvnbvIrAec8EQwsugZvsvzO3Q+d74f9IMXummoLR3bQ8IGLzuCADbbXeTeVPXcjjdW5h4ki7De8um1wYW6Cod5lq8zPggkgB+zXMFsUn0lh3gWuLF7lUYojMch8IakkddxUrGyMA5GgU6Bt0OZUokDLQLBKY88uqQPsEzfKz8x8/B5V3BhWuzHCz9HnT2BD+CqJkqt78MfBrbBLg97McuB5dny4LfMxAdJgx5F65ievZZRb08vIq1ES9ml2TGKUvzhgFIpymPQ7ZxQxwakhJNKCQum64+igXq4oFlUHs93Ld+WfA4PdFvHRgnZFu0OQ6UxTdlZd2hCNaWgLQOkAJyFFI4sUMT8V1q0gpMaXRAVrVr/v3lvbmoOuAeQhBenezYbJyvQ0yD7lmjfpdw22xGLRAbhAPKMmcy3tcW4QaIwRq0RfOm8UYWNMBpgSlVRF/I0b7dq+1YTCEG2oht5vMfdpF1DTRPEXlmg0wlnrFo3bVZXdSODcYQ== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(82310400004)(44832011)(70206006)(5660300002)(40460700003)(70586007)(8936002)(8676002)(508600001)(316002)(6916009)(36756003)(86362001)(4326008)(83380400001)(16526019)(336012)(82960400001)(47076005)(956004)(26005)(186003)(2616005)(36860700001)(356005)(2906002)(81166007)(6666004)(36900700001)(20210929001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 17:13:10.3529 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e19d1e1-85e0-46e8-4123-08d9e1b84b60 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT003.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3684 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jan 2022 17:13:14 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7514 From: Jan Kiszka This can be re-used by other customization recipes. Signed-off-by: Jan Kiszka --- .../{customizations.bb => common.inc} | 4 +-- recipes-core/customizations/customizations.bb | 27 ++----------------- 2 files changed, 4 insertions(+), 27 deletions(-) copy recipes-core/customizations/{customizations.bb => common.inc} (90%) diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/common.inc similarity index 90% copy from recipes-core/customizations/customizations.bb copy to recipes-core/customizations/common.inc index d302b4a..d3eb7b8 100644 --- a/recipes-core/customizations/customizations.bb +++ b/recipes-core/customizations/common.inc @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2022 # # Authors: # Jan Kiszka @@ -11,7 +11,7 @@ inherit dpkg-raw -DESCRIPTION = "CIP Core image demo & customizations" +FILESPATH_append := ":${FILE_DIRNAME}/files" SRC_URI = " \ file://postinst \ diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb index d302b4a..96e88dd 100644 --- a/recipes-core/customizations/customizations.bb +++ b/recipes-core/customizations/customizations.bb @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2022 # # Authors: # Jan Kiszka @@ -9,29 +9,6 @@ # SPDX-License-Identifier: MIT # -inherit dpkg-raw +require common.inc DESCRIPTION = "CIP Core image demo & customizations" - -SRC_URI = " \ - file://postinst \ - file://ethernet \ - file://99-silent-printk.conf" - -WIRELESS_FIRMWARE_PACKAGE ?= "" -INSTALL_WIRELESS_TOOLS ??= "0" - -DEPENDS += "sshd-regen-keys" - -DEBIAN_DEPENDS = " \ - ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys \ - ${@(', iw, wireless-regdb, ' + d.getVar('WIRELESS_FIRMWARE_PACKAGE')) \ - if d.getVar('INSTALL_WIRELESS_TOOLS') == '1' else ''}" - -do_install() { - install -v -d ${D}/etc/network/interfaces.d - install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/ - - install -v -d ${D}/etc/sysctl.d - install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/ -} From patchwork Thu Jan 27 17:12:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12727107 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA353C433EF for ; Thu, 27 Jan 2022 17:13:13 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.78]) by mx.groups.io with SMTP id smtpd.web11.679.1643303593049432141 for ; Thu, 27 Jan 2022 09:13:13 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=gSKpQVx8; spf=pass (domain: siemens.com, ip: 40.107.22.78, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kpp65VOKiZqWedxz/GT8ETBlTcSimkeCd6YwrRiwEd5yeMsjTWrUVVdG/n4URW3l2pHxTAPMMtEw5n2LEUi1mOPXKF54I18H6IMeDT8KI/oK+iVcOCggXixFMcv9ltJcKBAibz6UlHr6AtnvKA/x3QnUXO/QQVuVN/H2vebX5y4BQlIiSzAwFgxg/G3T4Ni7bDgiFBCXWZXnrcE94L+EAA7Y04V67ylir0D3/vbAYGPzsxrKRrza/r+RWPwgojCeeGk4jzvV3PRxUBNNm1S8k2Oc6pbrslu1b+tuB4X+5nGHUakr6f1KVGD8lBerRTshoWyE4EpSKJMs3zbP1gUG6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EC0lIKofTDzT3drt+Kt3tLtQxqj3bTu42bqNYS3ph8U=; b=iV8nSxdBhMu1qGsQJ5UYalufu7QYQ9PDklp/bkem2hNehPNaebi2zjkj0VsddXpgXuRteABgS/Ef/QnXLbtcnolsK+jrkAXCRXVwnVgUIqu4OAlhvsKETbmeWslr0urNTzcYqn73fvf+4sCrjCNH8XD+KkH3O5U2CpdZBbKt4w1awtEguivXihr4wBIl9JR/UwlTPZhmaScW3IoniCE+s+gBn2ESnXuoLT64Zv7nZ4u/wJa9y9NLWVJ+MekDt15+Et1EfSQufapq6gvRKZ2R1DLOd4rLTRvsaaujFNlFbtVl2yNs/6Ql2Z5O6YKvLUL9bJDdE9NJLJ1lnyQSNTiK5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EC0lIKofTDzT3drt+Kt3tLtQxqj3bTu42bqNYS3ph8U=; b=gSKpQVx8P+vodZaoYiCHtayRZFT//pxKX0c4x8tql9aAn+KsNIkZREoY6XMPdOiYkVsTqA8W9Gn00Q2fbAhCQjF5yexa17oBXiK4HcwfXw19wQxjoWH8uNSXqYPX7way1GiD/15gjnb5ONA2aF1GW3RBahxiCPmUQ955dKge+6nZu1/pELeY0j01j26qJrpm/Z7JgbLZpn/GNsnHtoX7/Z2Sgc5RI9Hdsm26P6UhREiQBJmWD67sqcDygDC3/Bq/9uGd408sVsbPrrUEICla+aZ/amGYyqDIojUQq551lJzf3yTUyoBLR6SPb0ZM+pu2JJwiaU1/bs6SbNfu3d2c+Q== Received: from DB7PR02CA0027.eurprd02.prod.outlook.com (2603:10a6:10:52::40) by DB6PR10MB1800.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:6:3a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Thu, 27 Jan 2022 17:13:10 +0000 Received: from DB5EUR01FT031.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:52:cafe::50) by DB7PR02CA0027.outlook.office365.com (2603:10a6:10:52::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17 via Frontend Transport; Thu, 27 Jan 2022 17:13:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by DB5EUR01FT031.mail.protection.outlook.com (10.152.4.253) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Thu, 27 Jan 2022 17:13:10 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 27 Jan 2022 18:13:10 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.73.11) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 27 Jan 2022 18:13:09 +0100 From: Jan Kiszka To: CC: Alice Ferrazzi Subject: [isar-cip-core][PATCH v3 6/6] kernelci-customizations: Reuse common customizations Date: Thu, 27 Jan 2022 18:12:43 +0100 Message-ID: <124e70d6301147514c30211eb43ea71523d0c36b.1643303563.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.73.11] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8529a1a1-7fdf-47d0-374b-08d9e1b84b72 X-MS-TrafficTypeDiagnostic: DB6PR10MB1800:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AhVaI9RtZxzYXE0FMB/RKfXP8in8BlI8gSTHYEAwP1qbgzgs8UnRYiSB6YxNKu8eDyMeUQY8ydiobpLcr1yzM9crhSNdtX6JkOJgRp9wii5A3ivavNTEFy+QSCfY2xKYmh9XtqphzAFfHDRVGvseVD5VuIy6D0bQzQSPhQ2fM9SQ6aK34LoMCy69FnwlOMupffO8V9uz6xF8Br1LFftXGhAna3cqkaPanYnepncm0B9bZlPuONddRTTwhmAXPPrUc9CSHSehbfxo6JHU7IEtj6uSCN1Pe2y/4VONA7nlMRb7q4KJKVuxb7dbMQ5QhGlkWmsVJYS/8V7txnbLCzzZ4AG7FZsrKDwISZDwGxVDxBJmr5uPsDqV5+m8s6kD+G2P54PXoUpUSK8HVkaNE750G4rIe5uiKjl1EqU8oqXcZqPlF5I+t5jI+KWvi1oyuuGoZrTqQvmsdF4cYJIkujqB+CvPGP+bjnRptLrt+GxicioGd6M5uVo+EWh7P8z14Oj4i2cCJyd5hzL5V9H3Sr0iVwcEVdPgcGpg9wjAS2WK+A6POhfHg96xqCROdapX6pQHpa2nbm1Fp+wKPRAse+C6leF5Jy5swTsfFQ2Zz0OriOUJ3TdvKEEI5TrwBZ+Tq8RUwqyLSOhIlwrLpqqsCxkSmhDX24fYXBX/izy/211axzqBCUub28H3AjANW8I4D6k/SiWpNutCqQkgk7ZKSkSuTHWff5gDUmid2pQ0IKZ2qNf7t+IYEEncakdiiCNZWmo86QU5oTatMVNpqS4HFbR54A6DgWCB7uORGe7t/Ee85Qw= X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(40470700004)(46966006)(4326008)(8676002)(5660300002)(86362001)(336012)(2616005)(956004)(47076005)(6666004)(26005)(44832011)(81166007)(36860700001)(36756003)(82310400004)(70206006)(70586007)(8936002)(82960400001)(508600001)(2906002)(6916009)(83380400001)(356005)(186003)(316002)(16526019)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 17:13:10.5019 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8529a1a1-7fdf-47d0-374b-08d9e1b84b72 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT031.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR10MB1800 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jan 2022 17:13:13 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7513 From: Jan Kiszka We can share most of the customization steps for kernelci with the common recipe. This comes with the theoretical risk that changes to the latter will break the former but has the larger benefit of avoiding duplications and gaining support for new boards etc. automatically. Signed-off-by: Jan Kiszka --- .../files/99-silent-printk.conf | 1 - .../kernelci-customizations/files/ethernet | 23 ------------------- .../kernelci-customizations.bb | 23 ++++--------------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf delete mode 100644 recipes-core/kernelci-customizations/files/ethernet diff --git a/recipes-core/kernelci-customizations/files/99-silent-printk.conf b/recipes-core/kernelci-customizations/files/99-silent-printk.conf deleted file mode 100644 index ad24d3a..0000000 --- a/recipes-core/kernelci-customizations/files/99-silent-printk.conf +++ /dev/null @@ -1 +0,0 @@ -kernel.printk = 3 4 1 3 diff --git a/recipes-core/kernelci-customizations/files/ethernet b/recipes-core/kernelci-customizations/files/ethernet deleted file mode 100644 index fa47d1a..0000000 --- a/recipes-core/kernelci-customizations/files/ethernet +++ /dev/null @@ -1,23 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2019 -# -# Authors: -# Jan Kiszka -# -# SPDX-License-Identifier: MIT -# - -allow-hotplug eth0 -allow-hotplug enp0s2 -allow-hotplug enp2s0 - -# used on BBB -iface eth0 inet dhcp - -# used on qemu-amd64 -iface enp0s2 inet dhcp - -# used on simatic-ipc227e -iface enp2s0 inet dhcp diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb index df4257c..91ad929 100644 --- a/recipes-core/kernelci-customizations/kernelci-customizations.bb +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb @@ -11,28 +11,13 @@ # SPDX-License-Identifier: MIT # -inherit dpkg-raw +require recipes-core/customizations/common.inc -DESCRIPTION = "CIP Core image demo & customizations" +DESCRIPTION = "CIP Core KernelCI image customizations" -SRC_URI = " \ - file://postinst \ - file://ethernet \ - file://dmesg.sh \ - file://99-silent-printk.conf" - -DEPENDS += "sshd-regen-keys" - -DEBIAN_DEPENDS = " \ - ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys" - -do_install() { - install -v -d ${D}/etc/network/interfaces.d - install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/ - - install -v -d ${D}/etc/sysctl.d - install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/ +SRC_URI += "file://dmesg.sh" +do_install_append() { install -v -d ${D}/opt/kernelci install -v -m 744 ${WORKDIR}/dmesg.sh ${D}/opt/kernelci/ }