From patchwork Mon Nov 15 16:17:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619913 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 F1702C433EF for ; Mon, 15 Nov 2021 16:20:20 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mx.groups.io with SMTP id smtpd.web11.24490.1636993219056954099 for ; Mon, 15 Nov 2021 08:20:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=UMgmQ2yt; spf=pass (domain: miraclelinux.com, ip: 209.85.210.195, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pf1-f195.google.com with SMTP id 8so3555452pfo.4 for ; Mon, 15 Nov 2021 08:20:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KkKoPRta3CjjLEn/Kh7baUS+JKV3w0vLt+gcKcz31MY=; b=UMgmQ2yt1cEKG9an59gGspDtVvHZ+OZqkkB64P++BEnE44FMJsW9QtXToKPXIQCvT6 403K6tyl5hb9NEXulQmgXLaTJLkwTGG3nWt4em4RFPZpF6501+Rpfm7zjHso2ibqaKlL f+77NMGQX+FuZ43WJ0CEI/Mw1d7ElhSPkB+H/crX96RHShvwOyVxmPNc5E3dZy6Xm4rg KXv91z4700k/bQcB5930JM+nZVs0CaVyae0oVag3ZNkn2u+87yIUwWpQnR8tia0hL6vK ul5gk0FyXVCSkoOoQNLuxqlkOJVA+dz79ud74fyDV4q65v9d75QINj/T78VsAXirsa8D L8Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KkKoPRta3CjjLEn/Kh7baUS+JKV3w0vLt+gcKcz31MY=; b=hTbhNDFhmjsZReaVcga7l/GLHJsDfuSZDmu0ASMX/C9SGO+BrGVJAKtoCTNehB2NxH Tz248Akb5wHf7dIH4gTVoNl9ZaLjE0evTLzSs3oC/UdwDBgUEqEhZERm5Fs5xhBcbG6K moUY0yeMrnpjJrgPO8drQRzN99ZKj4bI9rswj2qY+W6bvaTO4vucVtunrEkt+nsEz/B0 WIpuD6rOs7afQmNLVCvlExVOmdufo+a/wPwXg8UDQSMvxSkn8jcdlsPHNyq4eHr0LDCq GdQd5lNJ+0w0746ozRUdtg2pLl5vRNxsf82f+/24zAfnW1Rlv5JvDPdCntWHnytds7cx g9pg== X-Gm-Message-State: AOAM530dicdh2OCTHSQhUTUVzBbd6BHG4f7ZU+IDHyIF5Oxtk/8U6X1H HnEyxjH+NIT43MVLWBBgl/vizfjXE1cAlZo= X-Google-Smtp-Source: ABdhPJzFhD6m0/kPbO2d+1Thn/LAWtgVWcF/dFbxGT2LZNdD8JJxEiNljihQ6OhqJc0O5Rbger5W1A== X-Received: by 2002:a05:6a00:1411:b0:4a0:3472:e438 with SMTP id l17-20020a056a00141100b004a03472e438mr34009235pfu.68.1636993218659; Mon, 15 Nov 2021 08:20:18 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:18 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 01/11] Deploy tarballs and initrd to kernelci Date: Tue, 16 Nov 2021 01:17:14 +0900 Message-Id: <20211115161724.19516-2-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:20 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6904 Create script for deploy images to KernelCI file server using KernelCI api Signed-off-by: Alice Ferrazzi --- .gitlab-ci.yml | 4 +++- scripts/deploy-kernelci.py | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100755 scripts/deploy-kernelci.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5becd37..dd7d9cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ variables: targz: disable dtb: none deploy: enable + deploy_kernelci: enable stages: - build @@ -37,7 +38,8 @@ default: - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi; - echo "Building ${base_yaml}" - kas build ${base_yaml} - - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi; + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extention} ${dtb}; fi # base image build:simatic-ipc227e-base: diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py new file mode 100755 index 0000000..931504c --- /dev/null +++ b/scripts/deploy-kernelci.py @@ -0,0 +1,48 @@ +#!/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.staging.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-"+extension+"-cip-core-"+release+"-"+target+".tar.gz" +initrd_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img" +input_dir="build/tmp/deploy/images/"+target +upload_path="/images/rootfs/cip/"+cdate+"/"+target+"/" +rootfs=input_dir+"/"+rootfs_filename +initrd=input_dir+"/"+initrd_filename + +print("build directory contents:") +print(os.listdir(input_dir)) + +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_filename) + print("uploaded to: https://storage.staging.kernelci.org"+upload_path) From patchwork Mon Nov 15 16:17:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619915 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 E7B18C433EF for ; Mon, 15 Nov 2021 16:20:22 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by mx.groups.io with SMTP id smtpd.web10.24550.1636993221342773731 for ; Mon, 15 Nov 2021 08:20:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=Q94CWY27; spf=pass (domain: miraclelinux.com, ip: 209.85.210.193, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pf1-f193.google.com with SMTP id r130so15502700pfc.1 for ; Mon, 15 Nov 2021 08:20:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JhQxOc/l4/QaKw59aPNOabJyqbtmcQ6EDiF4DBzwq+4=; b=Q94CWY27eU0P9qYYAyrBlPXtNRuZFJf2sqSpj24d5aOW05hjWLVI+L27Q8P0VJQhn9 RxBgeh2ePDYqlYhLCnsAXjPmLtB53+nXolSPrD162kO79ID4zxKTP/GLxnSHdKTuWlNG kRszwjYz5IwcKU6LX87wDqvyyLFQ4akbVWKWTHK5QK8kCn0ZYhro7cumMg45BcHvkIDA /y6RMLz9OLH3KkxTUPPl7evZ1cs7yHURi5XGJMzd76/4WsUIAqjFG6fsKCq0TOa/w2+c SbsfXqPyb0299wSgf0hD08KuEihKyvd3NbtIyhZM9v2f6m+fbieD6Js1spaHmaQeVQyK K9vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JhQxOc/l4/QaKw59aPNOabJyqbtmcQ6EDiF4DBzwq+4=; b=Gi7tJGUpFdxRWIRXkaUJTivNnMU0/AmBTgwZ6xWc8C460laHsG5dPh6tYgkZ9Myj/J j+9KooF7PuR4NOf4R+gg7n3wGpLIkYXH+ocgAy+B+51Cdg8i7AVI/Q5+nm+WqVPmuO7B kVDNr8bHItF+BJiUuDKSNtld98GfscuZQnfNd3KbltSIIlZjdm0oUTpgMNddfTddOwwo mxgppJ7pLz+ggfXOPQmwNavpFy3n9PCzmKfRf2A8uGwalaK24B+406yMiSIfMTyIiLOa ns/7LzdciF+2ZKWaLCY5L3GEUyUDZIFf/gGBY8HAvwfcBNhFNqMS9HoCDZcxMpcbNohN JLRg== X-Gm-Message-State: AOAM530F/PN5Z9+KCAH6EkcVsFQBW5xSv6xZmAyq2Hf1Yv74iwu6l8Hn z44vQB9VPhmyMqhQjSXHeoEa3BdruRWPDow= X-Google-Smtp-Source: ABdhPJwBVRVAdh6JBhomNh+Msu30kSG9EGyMk9OSiWBFiaz3wrVhfm5g/xuZ6RGxUbtuJwddWrvtXA== X-Received: by 2002:a63:4a60:: with SMTP id j32mr47279pgl.140.1636993220809; Mon, 15 Nov 2021 08:20:20 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:20 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 02/11] Rename initrd with the gz suffix Date: Tue, 16 Nov 2021 01:17:15 +0900 Message-Id: <20211115161724.19516-3-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:22 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6905 Generated initrd are actually gz compressed and KernelCI need the initrd image filename to contain the gz suffix for work. Signed-off-by: Alice Ferrazzi --- scripts/deploy-kernelci.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py index 931504c..c2341a6 100755 --- a/scripts/deploy-kernelci.py +++ b/scripts/deploy-kernelci.py @@ -18,6 +18,10 @@ extension=sys.argv[3] rootfs_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+".tar.gz" initrd_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img" + +# initrd is actually gz compressed +initrd_gz_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img.gz" + input_dir="build/tmp/deploy/images/"+target upload_path="/images/rootfs/cip/"+cdate+"/"+target+"/" rootfs=input_dir+"/"+rootfs_filename @@ -44,5 +48,5 @@ 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_filename) + upload_file(api, token, upload_path, initrd, initrd_gz_filename) print("uploaded to: https://storage.staging.kernelci.org"+upload_path) From patchwork Mon Nov 15 16:17:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619917 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 C7343C433F5 for ; Mon, 15 Nov 2021 16:20:24 +0000 (UTC) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by mx.groups.io with SMTP id smtpd.web12.24746.1636993223447334007 for ; Mon, 15 Nov 2021 08:20:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=5b0oGJZx; spf=pass (domain: miraclelinux.com, ip: 209.85.216.68, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pj1-f68.google.com with SMTP id gb13-20020a17090b060d00b001a674e2c4a8so245176pjb.4 for ; Mon, 15 Nov 2021 08:20:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y3vwrzovosFv17eIiHM/BH7UUdoVlOvjSOw9eXLjzdA=; b=5b0oGJZxCY78r1j2cfxZ6zvtebFh53dlUTNLsuO2TAs1/JQa4kwQFb3lHng+1a0pnE zUdN3NhlkkNtlzU5jierGiNc9GybKNmBRsKP/EMxONVDHcoDdml1uSCiN0j0oS8egwyv RSDz0qRgZQYy/8YNXCup1B8XgB+zhIptXlREbGUd8SdkW8agRpTegX9Bru0adXb6yryr 6UfAJBz1ub5iXQ+iic8CK+jcgYrc0sAL533zUZmFHpuEKgtc3XxchzsX7Pr1TzKhjQFg zjtlBmZrMCBnXDQ8hfaqmMvZE9s8DJ383xvpHiVwa8dfCidN6yVmWIapeHjTCCKPmO2c 6fHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y3vwrzovosFv17eIiHM/BH7UUdoVlOvjSOw9eXLjzdA=; b=ASCWpTQIeQgt+qD57TfPl6/+BBu7dmg915CznD50rJBF/85x6wfLo55SjCGcCYFiGa nCWL49necFsc+N0nmxHDlYMFGJV1vvyFAbLg9coyyk1nd1ol8mQ5egw+4wJqH0z7Xidu ofzf1uvhUdaopIIIrf6M5Q1ZlpDrnZONLTJvdfjrTEqPgbQUMZ19VOYQbPCCa57RARZN HOPfYh4j4+t2O9VKU+L3DLm5tai3E4NLCSBiEP23Z8zEamRvJmDUC5FHiUOiUwojqRx0 9KkmTchM6dr+5W8d+5/zVQXWva0tcYzTlLfssPgHtSKpdDua8O7LWI8jkMDHOGtK5eo/ bpOA== X-Gm-Message-State: AOAM532z/mzjTGkavmmIKF+XijQ7AtoyV94zF2UHEa7sWm9qYGinzpMs OGznGn1TjxMKVUOjRsJU1rewcUaVlxGS6CM= X-Google-Smtp-Source: ABdhPJyufONINA/WzwZAJShAcPuJhFkKEqVOZtU2II3F8L830B9tpE/d3qmVUrco1dBf+UPaeG6qFw== X-Received: by 2002:a17:902:e88f:b0:141:f982:777 with SMTP id w15-20020a170902e88f00b00141f9820777mr37441953plg.68.1636993222929; Mon, 15 Nov 2021 08:20:22 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:22 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 03/11] Add latest folder to the storage fileserver Date: Tue, 16 Nov 2021 01:17:16 +0900 Message-Id: <20211115161724.19516-4-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:24 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6906 Creating a latest folder useful if we want to test the latest image. Signed-off-by: Alice Ferrazzi --- scripts/deploy-kernelci.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py index c2341a6..88c09d7 100755 --- a/scripts/deploy-kernelci.py +++ b/scripts/deploy-kernelci.py @@ -24,6 +24,7 @@ initrd_gz_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+" 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 @@ -50,3 +51,10 @@ if os.path.exists(rootfs) and os.path.exists(initrd): print("uploading initrd to KernelCI") upload_file(api, token, upload_path, initrd, initrd_gz_filename) print("uploaded to: https://storage.staging.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.staging.kernelci.org"+upload_path_latest) From patchwork Mon Nov 15 16:17:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619919 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 C38ACC433FE for ; Mon, 15 Nov 2021 16:20:26 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web10.24555.1636993225666436328 for ; Mon, 15 Nov 2021 08:20:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=UXKFPjZL; spf=pass (domain: miraclelinux.com, ip: 209.85.215.178, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pg1-f178.google.com with SMTP id n23so14949547pgh.8 for ; Mon, 15 Nov 2021 08:20:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qjdOy9CS5ZWuEy65mhqt65d+1lsNNmAofS+vEMcdyK8=; b=UXKFPjZLZDlm/0iFkiXWxjeUc74c1RCVfUFQw1/vmkbhPlKuDqHxfnDYvm2uHZVo+w F6wrO0k+UZmf55m1sHr89ZV98yZoVxswqiRHBaptXSJQBPxEFW9n4ooFbJDXfca4YzCr wsuTx4Hqear2Ng19XRAcrtyGhwWZCiv711HXRk+o9p3tSwcOgRUF8OvxYN2Vn/0foicu ARso0YbsX7rEB5nMYKBkT02ENnasz+QhimUfsG0/k3GCEXPvnGtjLv2WSrTATV6yQjz2 xgrfCDqQZP7OgyasSQVU3EptPlQYF5X6CEobrMsmddyRenkSpLpCtHE/MOaD0t3CUUTR MGfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qjdOy9CS5ZWuEy65mhqt65d+1lsNNmAofS+vEMcdyK8=; b=HsVK+KuvZEBIJpnJn9mFlRAaII8bOwmnvDW/57r3w5eRAhtk/GHJMm4GpLCPOi5Yw8 RUxUV0Dah4YBIXQa1Tz1SVhfb1t/2sR/0l0i7j6mbKvmtzb8Ik3n9ns/VQN59nES8afU Zfx7r0we1lt6VrQE8gXb6ktSWmBK/9FTMGumzWMWcRsIebvPJ87bohPnsSHVROW93a4M kW2p6LRXdk5otlJXXYNOqBFlAnIO1K8v71GFObYpwELz7tLTl+ceRu9+JkbHKTcon848 SCvMXLRpgkL5uAd0MK8DsFrIPanV0hXDL1Fvecq1fsI9KltECzGezL5mQo3hmJ/7s/64 O8dQ== X-Gm-Message-State: AOAM531qA/PPgC0uXZ+fwg+i7mb81SGkULU7jNkJr0us7hf5PUEIcZc7 +nDENCYgDl8XNPGojf2z3gt4lfjnd1WFucA= X-Google-Smtp-Source: ABdhPJy0msmPqRhuSpsy1P0STkee7UGgisCr/NfmG7FxK4+GSlcIpR5TYLMqmaw0JfQ3NMpzkUn72A== X-Received: by 2002:a63:8749:: with SMTP id i70mr42976pge.158.1636993224988; Mon, 15 Nov 2021 08:20:24 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:24 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 04/11] Create kernelci build step Date: Tue, 16 Nov 2021 01:17:17 +0900 Message-Id: <20211115161724.19516-5-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:26 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6907 By default disable KernelCI upload and enable it only when needed for KernelCI image build. Signed-off-by: Alice Ferrazzi --- .gitlab-ci.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd7d9cc..5f0463e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ variables: targz: disable dtb: none deploy: enable - deploy_kernelci: enable + kernelci: disable stages: - build @@ -39,7 +39,7 @@ default: - echo "Building ${base_yaml}" - kas build ${base_yaml} - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi; - - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extention} ${dtb}; fi + - if [ "${kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extention} ${dtb}; fi # base image build:simatic-ipc227e-base: @@ -79,6 +79,17 @@ build:qemu-amd64-base: wic_targz: disable targz: enable +build:qemu-amd64-base-kernelci: + extends: + - .build_base + variables: + target: qemu-amd64 + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + kernelci: enable + build:qemu-arm64-base: extends: - .build_base From patchwork Mon Nov 15 16:17:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619921 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 C9118C43219 for ; Mon, 15 Nov 2021 16:20:27 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web12.24747.1636993227385951774 for ; Mon, 15 Nov 2021 08:20:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=Wxj59Vkb; spf=pass (domain: miraclelinux.com, ip: 209.85.210.170, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pf1-f170.google.com with SMTP id n85so15464113pfd.10 for ; Mon, 15 Nov 2021 08:20:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Afwy6WTweoh3vqNkF33Puyh8Rk+RVYkBpdBKe+XAUmc=; b=Wxj59Vkb/A2X8Mdv5HU7c81PsFOGR8Oeyixr05BX6ZBDMD5eZEXesa8ipnlUDOnY5u ycQgjr8vJTuyzZWnQCRVDYRcuQQ4F2mnRRiofOP0bQI8YtUpRfyJtKIVpu6x//LHunC7 XhdyfZHiDMGy8G84F6U1+1xzdwZwuERJlb4oFOC4UJ59mWLigzMBd2/oP31XyOmfV+LM DOmALNPMDYkwRVnNPmO2SlA/w8m4WE7REo8wYV0PunDk+aMO1qFMR4pd5rbsxUwRob8W 35XUyDgGToVgAl50qdGs1sPhbj5OmhhMcNIoZavStpiKJbZbEkdI08Wn4GCbxyEZb+xk Xc2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Afwy6WTweoh3vqNkF33Puyh8Rk+RVYkBpdBKe+XAUmc=; b=SiPk8UxCBhZxJdxa4sTkIYMZ9P61yT2h+XMye2UdY2dkLSD15C2UaEx5kx1hwdm9Od YNU5QICaDSnP0FoPB161HU80bh76NMqzO9QfgiqscuK09va9bSGepojOjedGM5e+PAg+ 4jIM4femy9J37pim6fTAt4zFSWuKjpJM6z/xi0PjZXz5wfN1xP7t92Yue2jPBykZFRWr yFiyyLwQfFqesuyLw1gjGANwSEQ1srEIUxyxYrmAdKNmFH3FF5mcE69IDrsD9IfUNCfe dhvZlymOSv+1HvtZme4zuZqRdPo4/YCrBcU/wpKfcFt3L76f3iy+LkRdYACTlE0GoqlP Y/qw== X-Gm-Message-State: AOAM5301zuMqrxBvCNoSYGJEp5T8mByo94OTYKKLffjzEKX1izodgSJJ g5CBICBeDunIQTug//3pxtkb9Ybb9s2C/ok= X-Google-Smtp-Source: ABdhPJzditP/WiH9DjAa76kc2i6+ZfjFa78qVBNuyyQTcZkggODuodnIIgw/vrrOQBTYCIhmVbOmxA== X-Received: by 2002:a05:6a00:10d3:b0:49f:faf7:6f8e with SMTP id d19-20020a056a0010d300b0049ffaf76f8emr34646519pfu.75.1636993226991; Mon, 15 Nov 2021 08:20:26 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:26 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 05/11] Ignore extension argument when not set Date: Tue, 16 Nov 2021 01:17:18 +0900 Message-Id: <20211115161724.19516-6-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:27 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6908 Signed-off-by: Alice Ferrazzi --- scripts/deploy-kernelci.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py index 88c09d7..c234113 100755 --- a/scripts/deploy-kernelci.py +++ b/scripts/deploy-kernelci.py @@ -16,11 +16,18 @@ release=sys.argv[1] target=sys.argv[2] extension=sys.argv[3] -rootfs_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+".tar.gz" -initrd_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img" +if extension == "security": + rootfs_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+".tar.gz" + initrd_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img" +elif extension == "base": + rootfs_filename="cip-core-image-cip-core-"+release+"-"+target+".tar.gz" + initrd_filename="cip-core-image-cip-core-"+release+"-"+target+"-initrd.img" # initrd is actually gz compressed -initrd_gz_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img.gz" +if extension == "security": + initrd_gz_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img.gz" +elif extension == "base": + initrd_gz_filename="cip-core-image-cip-core-"+release+"-"+target+"-initrd.img.gz" input_dir="build/tmp/deploy/images/"+target upload_path="/images/rootfs/cip/"+cdate+"/"+target+"/" @@ -28,6 +35,14 @@ upload_path_latest="/images/rootfs/cip/latest/"+target+"/" rootfs=input_dir+"/"+rootfs_filename initrd=input_dir+"/"+initrd_filename +print("arguments:") +print(release) +print(target) +print(extension) +print("filenames:") +print(rootfs_filename) +print(initrd_filename) +print(initrd_gz_filename) print("build directory contents:") print(os.listdir(input_dir)) From patchwork Mon Nov 15 16:17:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619923 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 C581EC433F5 for ; Mon, 15 Nov 2021 16:20:30 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web09.24763.1636993229865640659 for ; Mon, 15 Nov 2021 08:20:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=cbfHfuW2; spf=pass (domain: miraclelinux.com, ip: 209.85.214.169, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pl1-f169.google.com with SMTP id b11so14827428pld.12 for ; Mon, 15 Nov 2021 08:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=orvSFtW0B9gucw2Op06xc2t0p/UXAg+WCI05HLcjNho=; b=cbfHfuW2UxcFcLoBX3svz/tP1bE3+0k9d/S6aMi3t37ngCgt1VFi00Q7n2plgdZ4hm 87pdh46b00wCP5kHzSCxGm2cpmnyX3cjAmeGSuolv34xGNpEJtv+x4fxuVOH76rjK3Nj 5z1cxm83S2rnZXWdLrU9OReg+4C9drD4gRLeFH1TOEGhJAae2d5MQbWoEWMFNKKWemkQ JzVUE9o0M0uaNM612PZk9JZ2auoRzbQlOxcy6o1lwUbhCqTg8UkTjBip1rS6XFKGNhB3 8gOjb/+fgME9m2r2Q8cdbgFv27uoukupMRvQX2tJCdVoyfY7p3H/funYG1NHj3qYCsHN M8aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=orvSFtW0B9gucw2Op06xc2t0p/UXAg+WCI05HLcjNho=; b=FbzTKPX+WRz/Us4hUoTBIjB5SwFGTTZcgG+3sg6POBBwxPawF9tCAq7HKcbFLV46fJ M+7IOxXSrHhTKQxhNqobFhJY/vQNM44btwe0uj6uzu4JUi+W8b0qXe9npClJCuggxfUM gfNxH3FjEKa0+FSzzE2miohnBHbTwTFLFRy9hZK1XJaVT/+Zbl5Iinr8KfaazlYA8L79 zKExQ/olwEGoY+s3bofZcD/oy6qJAwjZ3hqEkO5xL9a3oF1HTV8uTEftghpB358jdQC6 RqZJGAXnFZyJI/scKYt4L5jRqmY5/wr09ZyvnONt18Q9pHVXDaCADNPRbA44540qWbr+ n6Vg== X-Gm-Message-State: AOAM531sAfiwDZmVYRUvI9HAUIGRln00wma9MUfukVfStc6ak4yp1GWN M9PlnLRzyOGqXHBjpNEpwRFUnQWR4h0aTrE= X-Google-Smtp-Source: ABdhPJz0rYcPC/PClDUbbmmA9cU6XtUM9yvJYrYBpjbH+QCiFGRLJAB7O+Wdc0pm923praRcfkiEIA== X-Received: by 2002:a17:90a:df88:: with SMTP id p8mr67053644pjv.32.1636993229439; Mon, 15 Nov 2021 08:20:29 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:28 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 06/11] Enable KernelCI build step also for arm and arm64 Date: Tue, 16 Nov 2021 01:17:19 +0900 Message-Id: <20211115161724.19516-7-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:30 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6909 Signed-off-by: Alice Ferrazzi --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f0463e..9776754 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,6 +100,17 @@ build:qemu-arm64-base: wic_targz: disable targz: enable +build:qemu-arm64-base-kernelci: + extends: + - .build_base + variables: + target: qemu-arm64 + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + kernelci: enable + build:qemu-arm-base: extends: - .build_base @@ -110,6 +121,17 @@ build:qemu-arm-base: wic_targz: disable targz: enable +build:qemu-arm-base-kernelci: + extends: + - .build_base + variables: + target: qemu-arm + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + kernelci: enable + # test build:simatic-ipc227e-test: extends: From patchwork Mon Nov 15 16:17:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619925 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 CAAB5C433FE for ; Mon, 15 Nov 2021 16:20:32 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mx.groups.io with SMTP id smtpd.web10.24557.1636993231879669177 for ; Mon, 15 Nov 2021 08:20:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=04obOsQE; spf=pass (domain: miraclelinux.com, ip: 209.85.210.195, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pf1-f195.google.com with SMTP id m14so15454194pfc.9 for ; Mon, 15 Nov 2021 08:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pbqCdjKY9hrEGcHuob56VfMTMmdVTfPzLW8j0XbiGqM=; b=04obOsQE7ABU9J4O2snlHBJAEWthzP53ELqVRMGuHlVRVjYInbZJ/0jxS08vAr56w/ JydmFMLGuSYR0kExXf7JNOrF/PYPwyCSqKpNQH5i88aLlj35S5Z4i08Qw8Nh6sJP0Jcw 3a6bi3f0sWcdslarjwFU1FLkNPcU1doSej65nd1IHxMs0c/fvoSVgY+CciYlfe6EXuZY 7dMRcLJJToh6LYbbxeFlqSu3er4/ofX55CGaX1z8dcEn4toAg6iNQQn+A6b+K3l5TztJ 3lv/FKgRM3ikO9PFukc1lw4TEKk19xU5qgtvLQTOthY6b2KVzTS/ClbMigvNNzggQxj7 fPmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pbqCdjKY9hrEGcHuob56VfMTMmdVTfPzLW8j0XbiGqM=; b=HQouAbYw7uneaxMZX+2c005NcvV5Lpt9Yq/wQaFTbxJxyia3svhnRTiQ6FshTPFXlq 9pUa2TH0r4ale+D5hO/1uHM6TzNeusl3geVPP63QFljX7KUWlAH6FgQ3BTuO9dny7F1Z aAdpxdyr+riXVUT6Q8L5SidPS0BFoa9w8sV6Fn/vYS738qd/5CnHSlQP6CyG4e/psd6I mNuME7Q29xNWGxA8kUfI7CtLX/msKWuiGFqRXFK7tcoKd4jLm97GCkVjn1Il2HvypAiW kr+W2fHLzB5dsB4ePgRnztNKifjD1GAIfqpzngZihAO3Z21zEbBuppwg+zL55ptxq7b3 rntA== X-Gm-Message-State: AOAM531z+lKAqyM2CzujdmXDcSTYFRfHwH3nYiVzUwZElVUH8pEbdNXj OUXzDddI3FzsJD8DON1r53boof0389IV6nU= X-Google-Smtp-Source: ABdhPJzyuWoeobAE3bvediAYvSz5EQjpIyur9k9vQkQn1JCWQo0IvQr12T68JHhNIKNxgSWtXTCDOw== X-Received: by 2002:a63:fd43:: with SMTP id m3mr24903469pgj.355.1636993231348; Mon, 15 Nov 2021 08:20:31 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:30 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 07/11] Create cip-core-image-kernelci Date: Tue, 16 Nov 2021 01:17:20 +0900 Message-Id: <20211115161724.19516-8-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:32 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6910 Initialization of the cip-core-image-kernelci Signed-off-by: Alice Ferrazzi --- .gitlab-ci.yml | 3 ++ 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 | 22 ++++++++++++ .../kernelci-customizations.bb | 34 +++++++++++++++++++ scripts/deploy-kernelci.py | 13 +++---- 8 files changed, 122 insertions(+), 6 deletions(-) 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/.gitlab-ci.yml b/.gitlab-ci.yml index 9776754..7e9b31c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,6 +84,7 @@ build:qemu-amd64-base-kernelci: - .build_base variables: target: qemu-amd64 + extention: kernelci use_rt: disable wic_targz: disable targz: enable @@ -105,6 +106,7 @@ build:qemu-arm64-base-kernelci: - .build_base variables: target: qemu-arm64 + extention: kernelci use_rt: disable wic_targz: disable targz: enable @@ -126,6 +128,7 @@ build:qemu-arm-base-kernelci: - .build_base variables: target: qemu-arm + extention: kernelci use_rt: disable wic_targz: disable targz: enable 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..33faaeb --- /dev/null +++ b/recipes-core/kernelci-customizations/files/postinst @@ -0,0 +1,22 @@ +#!/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 + +echo "PermitRootLogin yes" >> /etc/ssh/sshd_config +echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config + +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..15788a0 --- /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/ +} diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py index c234113..1df4e72 100755 --- a/scripts/deploy-kernelci.py +++ b/scripts/deploy-kernelci.py @@ -19,14 +19,15 @@ extension=sys.argv[3] if extension == "security": rootfs_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+".tar.gz" initrd_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img" -elif extension == "base": + initrd_gz_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img.gz" +elif extension == "kernelci": + rootfs_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+".tar.gz" + initrd_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img" + initrd_gz_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img.gz" +else: + # base extension is not adding extension name in the filename rootfs_filename="cip-core-image-cip-core-"+release+"-"+target+".tar.gz" initrd_filename="cip-core-image-cip-core-"+release+"-"+target+"-initrd.img" - -# initrd is actually gz compressed -if extension == "security": - initrd_gz_filename="cip-core-image-"+extension+"-cip-core-"+release+"-"+target+"-initrd.img.gz" -elif extension == "base": initrd_gz_filename="cip-core-image-cip-core-"+release+"-"+target+"-initrd.img.gz" input_dir="build/tmp/deploy/images/"+target From patchwork Mon Nov 15 16:17:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619927 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 C6563C433F5 for ; Mon, 15 Nov 2021 16:20:34 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web12.24750.1636993233820531416 for ; Mon, 15 Nov 2021 08:20:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=coidG+EQ; spf=pass (domain: miraclelinux.com, ip: 209.85.215.171, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pg1-f171.google.com with SMTP id r5so9097224pgi.6 for ; Mon, 15 Nov 2021 08:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fu1ZwHDvpZi9jq3+hed5IRsIxvqULgbBYlnr/kEPFy0=; b=coidG+EQEp7aaz3FPrQ/jJiCvvWuETfLs7caNRVyDJzriPizf2vZlUTkjFUv2uQY7R vuCnvcTHJ5IOG6i8HkvsBLMGeF9v4HDUumcmTIT8UVHsuHOJPoFpcu1ZJku6ONW0lVQM +YXATm7UfzlgXkcE9QD/IfxyUtgVThYKsIv3Xcfiim/dQi/YlAtRr2y9/0XVYGRUAfwG mZWtAHwyFCdvD7RPiwKfbtVHg7NX/7aqHAbIwZiT+saV15UqtN/gVNUeXj8oKhyCNoyR kfuyzmhvtaSVnyqKNoXL0dTfvAon1j3QCXcS7aq/vsS5TrXJWW4Y1yzYYang1dIX6/3O J4LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fu1ZwHDvpZi9jq3+hed5IRsIxvqULgbBYlnr/kEPFy0=; b=lmNGMrziN0VDov4zAerVF2YAGTZFQiEmj2Olo1ccmzD39B8J7xYW/F+wiWByEXN2CB aYXrI20f6ggAJ9jmxihfg5+YGp0Z/BiCwJFMmh3Eerd8Nyy6PVXRvTc3ZpvUjH/SC1R5 sEgNpEG4BvxOjjkkFhfv2Mzpq5DergxZZzRptrzLx7YsW6WbK4rLb7a1mAPgcb+4dQCW PFZmMzGy74CKkQAIF5Z/8Nd3mT9j9oZttto9xKdImcISK2H6QmOvmVc3kyy2F8sXyYLS ST7p88Ee0AE4HiX7W2i7pVBrUxh1YtzX6vW4Rgsb3wg4sIaYpG8ZZCnvfGXfuZImZJBS Piyg== X-Gm-Message-State: AOAM5319a6hpnhXAkCTuC87Vun7pPT7jKqsdzBqH7pMSnkax1O2egYo+ G0zocVcUfyyfaX53chkMHBfQiqzmnhi8tJI= X-Google-Smtp-Source: ABdhPJwMjV6tFzANDccHOXdIUjIhZhziLi2to/KWX32yTgUYQ2vhr55VUV91DRL4La4nYz7tLliPQw== X-Received: by 2002:aa7:99cf:0:b0:49f:9d3c:ac0f with SMTP id v15-20020aa799cf000000b0049f9d3cac0fmr34352046pfi.39.1636993233399; Mon, 15 Nov 2021 08:20:33 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:32 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 08/11] Remove root password Date: Tue, 16 Nov 2021 01:17:21 +0900 Message-Id: <20211115161724.19516-9-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:34 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6911 KernelCI require the image to login automatically without root password for testing. Signed-off-by: Alice Ferrazzi --- recipes-core/kernelci-customizations/files/postinst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes-core/kernelci-customizations/files/postinst b/recipes-core/kernelci-customizations/files/postinst index 33faaeb..68ef9d3 100644 --- a/recipes-core/kernelci-customizations/files/postinst +++ b/recipes-core/kernelci-customizations/files/postinst @@ -14,8 +14,16 @@ 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 HOSTNAME=demo echo "$HOSTNAME" > /etc/hostname From patchwork Mon Nov 15 16:17:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619929 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 C6D42C433F5 for ; Mon, 15 Nov 2021 16:20:39 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web08.24761.1636993238292250385 for ; Mon, 15 Nov 2021 08:20:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=xTatHn4J; spf=pass (domain: miraclelinux.com, ip: 209.85.210.172, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pf1-f172.google.com with SMTP id 8so3556248pfo.4 for ; Mon, 15 Nov 2021 08:20:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FpNNBhzx+EkkmLyYUt8Ys1hUWbKadF//lbTRS+QvB7U=; b=xTatHn4J5hZ55d+cBdrPWMaFp73zL1wFvqo5/wFuUR+poqwUrvepNT8ZUXW9CH0/Hm FxN4/A+R3Bat+B7NgdkR3Ze75VLFCRyckS5ASumqUMoh2ibyf/FEmon26+m88lWtf5LI GZ5dFWJCu+x7dkOekWSqU22rJiW1NpBpEb1nSfN0PlzDozZzXpeDQ54B0V6RLh1d95Xk eh5j4UsvmZFdD4jfDgxzuB5TW5kOu/FU5OPYIyIbwuhLrzDm/NdgdqcbfIotswzu8AGD peqp/gzrcVRBfPyyRjKBNLnuT5HVgTsuiN7f37U47vz6bFankFngOZPHVhALb7Q8m3as c/Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FpNNBhzx+EkkmLyYUt8Ys1hUWbKadF//lbTRS+QvB7U=; b=SuNu4bjxarepvF6QJAjXM2TWXJyHvenhIvhUOVq9Uu5oZJSUiq+qYhlfltMKmZ436z NQ4+eLqKTodIZ6Jbfnoac1j+YGXIckJid6TzJ8MrEGguJGlNwqQgew1aNMpx6I782R6t nR3XD2BybqRQj9HmWoyjF2qipB6MK0qRN/vdzILNsbArh9s0BfRSk/goVAk1iS5zaPY5 x69z1XWeFe95oncDgYhoN1OnqaIjiPIbwlWnlq+FxfmfnitkMCfTOlLTOqorpz32v7yl Oqo/dV7K/n7UkY002w4FELREeZVPmGRVvmljLcOKUnjv7pY+FL7oUh8i1qdrH6HH1df+ Y7/w== X-Gm-Message-State: AOAM533TO2qGLBzF0LMdMZMpHZE+s6OLdvxIXFIPSClaPXu6oHCZiJ14 Wvb8ZZZPX4n3GqPY/IfVERahWlKk/oI4TL8= X-Google-Smtp-Source: ABdhPJzCDVI8mIdGyq5SFssG2vqJp2yLfUE5n21ZfbB5E6nUuQD1Awm2NVXL1xF1kY52nV2Folpj4g== X-Received: by 2002:a63:6806:: with SMTP id d6mr34373pgc.268.1636993237860; Mon, 15 Nov 2021 08:20:37 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:36 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 09/11] Set the profile for KernelCI Date: Tue, 16 Nov 2021 01:17:22 +0900 Message-Id: <20211115161724.19516-10-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:39 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6912 This profile is need for make KernelCI recognize that we have successfully effectuated the log in. Signed-off-by: Alice Ferrazzi --- recipes-core/kernelci-customizations/files/postinst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-core/kernelci-customizations/files/postinst b/recipes-core/kernelci-customizations/files/postinst index 68ef9d3..7ae30e8 100644 --- a/recipes-core/kernelci-customizations/files/postinst +++ b/recipes-core/kernelci-customizations/files/postinst @@ -25,6 +25,10 @@ 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 From patchwork Mon Nov 15 16:17:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619931 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 CB834C433F5 for ; Mon, 15 Nov 2021 16:20:41 +0000 (UTC) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by mx.groups.io with SMTP id smtpd.web09.24770.1636993240649585664 for ; Mon, 15 Nov 2021 08:20:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=HIuB7Ueh; spf=pass (domain: miraclelinux.com, ip: 209.85.214.196, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pl1-f196.google.com with SMTP id v19so4164669plo.7 for ; Mon, 15 Nov 2021 08:20:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qM5NKEFLl6w02DySQC+9Qr0hpqAPAAOh4OF2MtLXxwo=; b=HIuB7Ueh/V7COjjUZPENrmaT2htp7P9HbtOY4mZ5+u3d2uCEa0D5VoXk9SRIaa/n2c u1x43C+hXaXHEizo5Il/LqB3cgPdcoJjYmn/uEWeGH8Ar8sCyquxpe+nlCP2Y3bWBDGu o7oia7zKKwnB0bGn7KnC8iiBb/DN1flabQi672bHhL3+pdP0POHOBIk5AF5FQ/1z1E0+ UZK3yJy4IlqjdvZF85jeyHP7Z2dr4DUqpaWF0Z5KajlJtwAlDhpFvXcmy4HJevu41mkU p7F7Se9zDXzLXRD/QtQatTbYbYdTFlkkYtYuqz3bCP6dTFOMkYh55nEoHw8Ufs+qdgGC pcQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qM5NKEFLl6w02DySQC+9Qr0hpqAPAAOh4OF2MtLXxwo=; b=zUtghtB9ButKu26E/inrKBCun79CR5adLdLnom0ZK1mjnqmHkHoUh5YexZCjSewWEW LHjCUkIJ1RnTDweHinVoQT4/rEGj7Dg+mdZqBAheksUxCuBgvLK2f1wJtFYCR3Fse7Gm 8hvXIcs9zXKmhwEBh57RX8+ZMf3e8qoLHD6LoVw4v9LnbicJzsD0HXMSKs99mCB37Zhh b700wkdIPRDvkA07fkGy5sdsM2nxjdnlJbwGaHz/58yS81ubz/cgh4w2b5J3iUP/roRV WZ/a1JeJ8n1y0V8pbsKpgCGqtq1yQSaLKQlfN3DLBs1ACb+fsQbtxeArbg3OlFh/Nx4C fqTA== X-Gm-Message-State: AOAM530QGoIhFOSR4KKqfH7buuyeyb7z+Wzaw4QuAMo8SdOWIfS08Tu1 Iw9mZ+Bx/4rk+QYCNtAp3QRHVw75KeMpJm4= X-Google-Smtp-Source: ABdhPJyXoDm4jXJS/qWb/IXQLTUb29wKM2NXntdVJ4Y33Y3e2/H/+dvO3xg58m2RsviBE/6oJP45Bg== X-Received: by 2002:a17:902:f551:b0:143:759c:6a30 with SMTP id h17-20020a170902f55100b00143759c6a30mr37517539plf.0.1636993240258; Mon, 15 Nov 2021 08:20:40 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:39 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 10/11] dmesg.sh is needed for KernelCI Date: Tue, 16 Nov 2021 01:17:23 +0900 Message-Id: <20211115161724.19516-11-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:41 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6913 This script is needed for make dmesg logs readable by lava. Signed-off-by: Alice Ferrazzi --- .../kernelci-customizations/files/dmesg.sh | 23 +++++++++++++++++++ .../kernelci-customizations.bb | 12 ++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) 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 15788a0..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" @@ -26,9 +27,12 @@ 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/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/ + 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 Mon Nov 15 16:17:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 12619933 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 CC6B3C433F5 for ; Mon, 15 Nov 2021 16:20:43 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by mx.groups.io with SMTP id smtpd.web10.24558.1636993242789494934 for ; Mon, 15 Nov 2021 08:20:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@miraclelinux-com.20210112.gappssmtp.com header.s=20210112 header.b=eSKqbaRo; spf=pass (domain: miraclelinux.com, ip: 209.85.210.196, mailfrom: alice.ferrazzi@miraclelinux.com) Received: by mail-pf1-f196.google.com with SMTP id x5so4810057pfr.0 for ; Mon, 15 Nov 2021 08:20:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miraclelinux-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YhMnsci9kUDecgebxD7brs2H6ZIc9DiW1q8g3wJtknE=; b=eSKqbaRo//5+ZcxRVFMY8QszDBWoSAq35FCfCg7r7nnwMPp6I/R9bz/w9aGc/wileE yqysY0ofOFg1OL0rh0o4Zv3+19kYPRF0/2CraPm+ejynwlItBmxG96/NDs4bBo3BAqgl wyliqCqeuE8bmbWF+Za5mwhUtBcnvN+bfO1nnqC8Li6oo65wA1Sb8S04Mp+Hx5Hy6t3M CXsuAUBN+OxHzlv8G3UgZ/uNaRcTlzsgeQuL4vYcHxYriONxt0vNEsJf14dWMuxbaJve COd415ulBR+GL26g9KIExPB91+EdVtiQoB9cmf9LQ8S0at+DZ+JPhS4V7BVd0xbtgJma cKQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YhMnsci9kUDecgebxD7brs2H6ZIc9DiW1q8g3wJtknE=; b=uYjbT3RJt0CA85x8jCUjhKuOKLTzeM1VnaxXt7kznJoy/GZVBL15RNM4cS8ykfDRDw USW+A8fH+onanvHjrG/1aEXz5fCRqopLk0tWxPpdS3TOeGoUZ/hnH5+NKZaWXtKmRBIv 7hafGsLkZvSGA0AGmp0qTnc2y5rSFZZGIKWKw6gzRYIjAelyQP2rmP/I95eCwSwjmDod mC3W2Pk8POjQJISBrOgDK7LmNuiSDixdGdnUhDlNZi95Tf7GajjoSjiKnJs8qxXIdiaW c4wAFIR5521++UGRsXXdSeexPzUvPK/ZSNxm26w/eHVW8yrXSuYH1KYCQDYgSy4UOzsg SJjw== X-Gm-Message-State: AOAM530YU9IY2OOEDaSNFPBqhnhZt26C6eRmK0mbtgILvcEkn6yHwmqf cufgmIXgAFMJlW2fzpk/cHrES1pOEWCWlpo= X-Google-Smtp-Source: ABdhPJzEeUyYwGDIQ8YB89B2OieZfLZv1paQ/eBRBxbWmyDQcMiuwHIy3r+qqyqGDShZeTY1cNA3Yw== X-Received: by 2002:a05:6a00:1945:b0:44c:a955:35ea with SMTP id s5-20020a056a00194500b0044ca95535eamr33461509pfk.85.1636993242378; Mon, 15 Nov 2021 08:20:42 -0800 (PST) Received: from alicef-pc.nkano1.kt.home.ne.jp (27-139-229-132.rev.home.ne.jp. [27.139.229.132]) by smtp.gmail.com with ESMTPSA id h186sm13850289pfg.64.2021.11.15.08.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 08:20:41 -0800 (PST) From: Alice Ferrazzi To: cip-dev@lists.cip-project.org Cc: Alice Ferrazzi Subject: [isar-cip-core][PATCH 11/11] Upload to KernelCI production Date: Tue, 16 Nov 2021 01:17:24 +0900 Message-Id: <20211115161724.19516-12-alice.ferrazzi@miraclelinux.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> References: <20211115161724.19516-1-alice.ferrazzi@miraclelinux.com> MIME-Version: 1.0 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 ; Mon, 15 Nov 2021 16:20:43 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/6914 Signed-off-by: Alice Ferrazzi --- scripts/deploy-kernelci.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py index 1df4e72..479b971 100755 --- a/scripts/deploy-kernelci.py +++ b/scripts/deploy-kernelci.py @@ -9,7 +9,7 @@ import time from urllib.parse import urljoin cdate=time.strftime("%Y%m%d") -api="https://api.staging.kernelci.org/upload" +api="https://api.kernelci.org/upload" token=os.getenv("KERNELCI_TOKEN") release=sys.argv[1] @@ -66,11 +66,11 @@ if os.path.exists(rootfs) and os.path.exists(initrd): 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.staging.kernelci.org"+upload_path) + 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.staging.kernelci.org"+upload_path_latest) + print("uploaded to: https://storage.kernelci.org"+upload_path_latest)