From patchwork Mon Aug 31 09:21:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 11745995 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 295911709 for ; Mon, 31 Aug 2020 09:21:29 +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 BBED82073A for ; Mon, 31 Aug 2020 09:21:28 +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="Fyd23x4P" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BBED82073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5339+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id m5otYY4521763xjmimmTIzEP; Mon, 31 Aug 2020 02:21:28 -0700 X-Received: from lizzard.sbs.de (lizzard.sbs.de [194.138.37.39]) by mx.groups.io with SMTP id smtpd.web10.49900.1598865686656645735 for ; Mon, 31 Aug 2020 02:21:27 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 07V9LNO0030076 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 31 Aug 2020 11:21:24 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.39.104]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 07V9LMgP030412; Mon, 31 Aug 2020 11:21:23 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Cc: Nobuhiro Iwamatsu Subject: [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name Date: Mon, 31 Aug 2020 11:21:20 +0200 Message-Id: <9be5523d6a3ef4bdd3a01b3b8c834b9a4d140a64.1598865682.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 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: b6RMRgqkIcLlaGx7ylw8haZex4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1598865688; bh=SiPxYN59CUbduOg01hRJrHCaOgV7yR5bfEICa6crSLg=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Fyd23x4P8nQoJ7N+5zkvkWjDthIzrOvuxdQ1FsCaqaa7+1d5jJX6niV3KpP8CuE/3sr 9zvd9qI8Ljgy0RDsrK6QgEWOlKAZseJVgneRPSo4v0KYblFSfH5W8oAYAiPOAnx2huW1V MGmQ2Le9amjd/2BV9UTEJP3jqs3/eVQqzSE= From: Jan Kiszka This allows for fixing the extends-based CI build. Fixes: 3510f8a66f80 ("ci: Rewrite using extends") Signed-off-by: Jan Kiszka Reviewed-by: Nobuhiro Iwamatsu --- .gitlab-ci.yml | 4 ++-- kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af900de..cd25437 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ build:hihope-rzg2m-base: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb build:qemu-amd64-base: @@ -97,6 +97,6 @@ build:hihope-rzg2m-test: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m extention: test dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb diff --git a/kas/board/rzg2m.yml b/kas/board/hihope-rzg2m.yml similarity index 100% rename from kas/board/rzg2m.yml rename to kas/board/hihope-rzg2m.yml From patchwork Mon Aug 31 09:21:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 11745997 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 73E13618 for ; Mon, 31 Aug 2020 09:21:29 +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 4DF812073A for ; Mon, 31 Aug 2020 09:21:29 +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="nIl8Mj4G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DF812073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5337+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id T8EjYY4521763x4ERJisOq7l; Mon, 31 Aug 2020 02:21:29 -0700 X-Received: from thoth.sbs.de (thoth.sbs.de [192.35.17.2]) by mx.groups.io with SMTP id smtpd.web11.49655.1598865687016356714 for ; Mon, 31 Aug 2020 02:21:27 -0700 X-Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 07V9LOGE001624 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 31 Aug 2020 11:21:24 +0200 X-Received: from md1f2u6c.ad001.siemens.net ([167.87.39.104]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 07V9LMgQ030412; Mon, 31 Aug 2020 11:21:23 +0200 From: "Jan Kiszka" To: cip-dev@lists.cip-project.org Cc: Nobuhiro Iwamatsu Subject: [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image Date: Mon, 31 Aug 2020 11:21:21 +0200 Message-Id: <83d75816ceb5f74802ac0cec5292bf257ffc2d48.1598865682.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 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: 29ChwelMP4nUDfZXWx77oeFhx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1598865689; bh=m8J3IN3QqXa89TwBoAsg0H7Wxm1cp4d/uleH4Qn0cxM=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=nIl8Mj4G+VgurbcNVTAv8LQtzu5O5pOwQm8vj+wxphsqKTcfUA3OE1xUauLM2ty/BY8 A/E/8bB3gvzrjhXKsbtH07h5BLthOT2xL966eAMsPnNqrfrjaWD2tjH+AWH3Vva3tUmlm 7IfM4QgOjVBqGuxoO+8GMcvDKvudWXC7zGM= From: Jan Kiszka This is not used, and the image is not available, so it breaks the build. Fixes: 3510f8a66f80 ("ci: Rewrite using extends") Signed-off-by: Jan Kiszka Reviewed-by: Nobuhiro Iwamatsu --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd25437..0b0a771 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ variables: use_rt: enable targz: enable dtb: none + deploy: enable stages: - build @@ -30,7 +31,7 @@ default: - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi; - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi; - kas build ${base_yaml} - - scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb} + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi # base image build:simatic-ipc227e-base: @@ -68,6 +69,7 @@ build:qemu-amd64-base: extention: security use_rt: disable targz: disable + deploy: disable # test build:simatic-ipc227e-test: