From patchwork Wed Jul 22 00:50:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Sangorrin X-Patchwork-Id: 11676885 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B4A013B6 for ; Wed, 22 Jul 2020 00:51:13 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4E54207CD for ; Wed, 22 Jul 2020 00:51:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="C7ffNGKb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4E54207CD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=toshiba.co.jp Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+4953+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id O1BlYY4521763xVXPsj5VN93; Tue, 21 Jul 2020 17:51:12 -0700 X-Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.157]) by mx.groups.io with SMTP id smtpd.web10.9336.1595379068710522283 for ; Tue, 21 Jul 2020 17:51:10 -0700 X-Received: by mo-csw.securemx.jp (mx-mo-csw1115) id 06M0p4ha006743; Wed, 22 Jul 2020 09:51:05 +0900 X-Iguazu-Qid: 2wHHK1VZrujqeF5EAW X-Iguazu-QSIG: v=2; s=0; t=1595379064; q=2wHHK1VZrujqeF5EAW; m=hTTTEhgJJES57SXJMQULueuff2+sUkCT/O0/Dqby680= X-Received: from imx12.toshiba.co.jp (imx12.toshiba.co.jp [61.202.160.132]) by relay.securemx.jp (mx-mr1113) id 06M0p3n9017000; Wed, 22 Jul 2020 09:51:04 +0900 X-Received: from enc02.toshiba.co.jp ([61.202.160.51]) by imx12.toshiba.co.jp with ESMTP id 06M0p32F007704; Wed, 22 Jul 2020 09:51:03 +0900 (JST) X-Received: from hop101.toshiba.co.jp ([133.199.85.107]) by enc02.toshiba.co.jp with ESMTP id 06M0p32s018240; Wed, 22 Jul 2020 09:51:03 +0900 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gtHYPphAUPQD0QfWGBj4BxA+DNXz6Np7aK1EWjOnbVipE2em6+fj6Oqfp8MVccKe9YOPsKO7rzdx1myMzKJx7Q7qUPZetg2tlmqqGcus+hxW7od55PwFQfc0CZp+biVrbmK30YdLMQA01aRdUe9OyWiVmo/LQj18/TKiFaAlos1/Vpo6tTpkTCA+ADb96xnl0qRWsvLtkbex3I+VI9yvuUQa7YtuwyuX10kYcn1oT64kDMHm3bxuizTEtarkVblD2zh6ypn398ZcFIpJv5D1ojyD1f+Tm3gHeR+TWKFQcXq0yhja+/B3oa7IXdMqS7lTtunNe9cVDCEpp3+3dWvNVg== 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-SenderADCheck; bh=u720vdfGubmuh7qektdQgv7uktwHoyf2VK/58BkX358=; b=oVTHhnfClTZ/FsyAImftac/aOs6oJRwtXNQ6OouTHVTqtI+Pftxi+/N5Y67/e06LtNpfu9jSWzeVa4vmegliuIw8ggqhUMISzw1Y3WTOBwuBqUcG6AIxew3lkeH/UmOQPuYxgBhcquGFJnOvJYOLB4osWQn/KSj4evn3gDB++tpgCnXuZM1Bf9RcrSdZeHezeDMbvVgkwXWOHLncK85fo1MG3HM+m4z+IVtPGP0WKurQpuroXnhtNojMSDVi16jYA2wiwHTCxF5TPheQLYM5XBtfSN0uMBtimMTW4OgU9WczoD9kSWTsiRbLCExdehvjHOuxSKrmuomusT8f675trQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=toshiba.co.jp; dmarc=pass action=none header.from=toshiba.co.jp; dkim=pass header.d=toshiba.co.jp; arc=none From: "Daniel Sangorrin" To: CC: Subject: [cip-dev] Fw: [isar-cip-core] tests: put all tests into a opt layer Thread-Topic: [isar-cip-core] tests: put all tests into a opt layer Thread-Index: AQHWX04ClCUHA3hxv0Syz8BWlTK0ZakSxQ1p Date: Wed, 22 Jul 2020 00:50:59 +0000 X-TSB-HOP: ON Message-ID: References: <20200721105928.1309238-1-daniel.sangorrin@toshiba.co.jp> In-Reply-To: <20200721105928.1309238-1-daniel.sangorrin@toshiba.co.jp> Accept-Language: en-US x-originating-ip: [103.91.184.0] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6222aab9-7cb5-4891-3c84-08d82dd94d39 x-ms-traffictypediagnostic: OSBPR01MB3814: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: GdHK5NGowqFRS1RFdLx/zfsp8M6UzayrNFgBBTnkXbD4fPhVujYNvebM/1WE7H0r2q6eGz7XDgS5PUOBpn7MRrq6BmWis/AXTqLmUOtYj/zyY7mujb/67tFG30JAGsMgz5oyrDcdWQ2F2O7/tIViMgLgw9rl7zI7AXWg4+s4xzk5failv92nK4x9tx6Ndsr2h2/cgYb9tTh4VH3l1CTXskFK16gGT+k42ebNcGkzeFo8cb9SLrHcJrN+J1Gn1NRWrzxh+NS0y5M3mzmYE8TsH6pOqcq+YU06DHkB/hh/C0o15jE6dF5E4e/GZufreQ7chL4yofNe7W0yiAS+EliFPyCabGAh85G/r5xzkbPxaZUGkD2wrSVP3RL4gUKfjwjE x-ms-exchange-antispam-messagedata: dxymtqsLsYw9DPrqqmOOHBHkqDGMnIe1VrK9LMb8ghQs37DJJg3cVcfWqyJHtFbGSXPKMZVHE5Ei0bN4o3dMdl10hjXUTP9NghE33irV+yv4JHmxb7RQouxUWmlApPLvhYXWnlGnq/WPuGfnqdbiMtA6fJyOy/1dIUJxqy1eolDXg6gC/ylsttypaK6vIB9326UcFL+4DP/kkZJVS0nP2dgVXp/SvxKRUldVr2wfkFKosfmilgnNaCmk9ZxxDjBF3V+ytIToVUQK03+94nWdQryDp1lTXcDD9iRln1KUfopQtFzc3TDpS+HeSflTzycIfn9R/rqPoohcoJVSEL8VHWiDJwQ8DFU4ua54rnTomWDdu+qwWaI6qZ5YXBFPNK/3P1j9PRn7us4yIpEQTGUOvxcwESuL8ZjbRVdvc33I5yDjy1J5bJSj9ptiLXaAs6sJ1G16l5Vgf2LvBa8kI/53ffh5t+uE4ZMvoeIbdzLaDoI= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: OSBPR01MB2053.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6222aab9-7cb5-4891-3c84-08d82dd94d39 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2020 00:50:59.8705 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f109924e-fb71-4ba0-b2cc-65dcdf6fbe4f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cpOU0K5MMI1rmON4Z8vrv0g2fC9tHho1lonRdsjL2xmqmXZ1AhR9NZ+s49RpqDePeHeMwSPke8+Yny3/kTO47t0PUTB5Xyd1IFp7X11RXMg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSBPR01MB3814 X-OriginatorOrg: toshiba.co.jp MSSCP.TransferMailToMossAgent: 103 Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: D575hVQXJm66me41lk5TEwBvx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1595379072; bh=hUCc0NgHmHpB9c4M9haLop66GQJn4ge28JGHFTqEWN4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=C7ffNGKbRFh2FoGs2lwHXQqiDoOshxIR+4nznxSbfYzmyUX+0MJE6LtYQ1RAHsoPLEs F41ziINe2AASqKM4l/fha+6VI4J+6bmWa4kP6F0Njg8CRU4D5qdEbf3d0xe5T0PaBdlPr 1Rg7aj8S1wKOFa2E0hlHU0I5UTYbwcvuSxw= Hi Jan, Sorry, I failed to put you in the Cc when I sent this patch. There are also 3 patches from Venkata-san on the cip-dev mailing list (sent yesterday) Apart from that there are some merge requests on gitlab. Thanks, Daniel diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f1dc91..90eec1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,17 +13,17 @@ all: - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY - - kas build kas.yml:board-simatic-ipc227e.yml:opt-rt.yml:opt-targz-img.yml + - kas build kas.yml:board-simatic-ipc227e.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml - scripts/deploy-cip-core.sh buster simatic-ipc227e - sudo rm -rf build/tmp - - kas build kas.yml:board-bbb.yml:opt-rt.yml:opt-targz-img.yml + - kas build kas.yml:board-bbb.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml - scripts/deploy-cip-core.sh buster bbb am335x-boneblack.dtb - sudo rm -rf build/tmp - - kas build kas.yml:board-iwg20m.yml:opt-rt.yml:opt-targz-img.yml + - kas build kas.yml:board-iwg20m.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml - scripts/deploy-cip-core.sh buster iwg20m r8a7743-iwg20d-q7-dbcm-ca.dtb - sudo rm -rf build/tmp - - kas build kas.yml:board-rzg2m.yml:opt-rt.yml:opt-targz-img.yml + - kas build kas.yml:board-rzg2m.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml - scripts/deploy-cip-core.sh buster hihope-rzg2m renesas/r8a774a1-hihope-rzg2m-ex.dtb diff --git a/README.md b/README.md index bbad1a0..7339396 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,10 @@ this: This image can be run using `start-qemu.sh x86`. +If you want to include the testing layer add ':opt-tests.yml' like this + + ./kas-docker --isar build kas.yml:board-qemu-amd64.yml:opt-tests.yml + The BeagleBone Black target is selected by `... kas.yml:board-bbb.yml`. In order to build the image with the PREEMPT-RT kernel, append `:opt-rt.yml` to the above. Append ':opt-4.4.yml' to use the kernel version 4.4 instead of 4.19. diff --git a/opt-tests.yml b/opt-tests.yml new file mode 100644 index 0000000..a1f431d --- /dev/null +++ b/opt-tests.yml @@ -0,0 +1,19 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Toshiba corp., 2020 +# +# Authors: +# Daniel Sangorrin +# +# SPDX-License-Identifier: MIT +# + +header: + version: 8 + +local_conf_header: + tests: | + IMAGE_INSTALL += "ltp-full" + IMAGE_PREINSTALL += "rt-tests stress-ng" + diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb index 38881fb..cbd6daf 100644 --- a/recipes-core/customizations/customizations.bb +++ b/recipes-core/customizations/customizations.bb @@ -11,7 +11,7 @@ inherit dpkg-raw -DESCRIPTION = "CIP Core image demo & test customizations" +DESCRIPTION = "CIP Core image demo customizations" SRC_URI = " \ file://postinst \ @@ -21,8 +21,7 @@ SRC_URI = " \ DEPENDS += "sshd-regen-keys" DEBIAN_DEPENDS = " \ - ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys, \ - rt-tests, stress-ng" + ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys" do_install() { install -v -d ${D}/etc/network/interfaces.d diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb index 9ee4b25..188c714 100644 --- a/recipes-core/images/cip-core-image.bb +++ b/recipes-core/images/cip-core-image.bb @@ -15,5 +15,4 @@ ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always DESCRIPTION = "CIP Core image" IMAGE_INSTALL += "customizations" -# for cip-testing -IMAGE_INSTALL += "ltp-full" +