From patchwork Mon Aug 31 01:02:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 11745365 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 5E9F8109B for ; Mon, 31 Aug 2020 01:02:56 +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 D43082083E for ; Mon, 31 Aug 2020 01:02:55 +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="EGu+8dXt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D43082083E 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+5330+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id hzf3YY4521763xS7WqMNEd4q; Sun, 30 Aug 2020 18:02:55 -0700 X-Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.157]) by mx.groups.io with SMTP id smtpd.web11.43646.1598835771889632340 for ; Sun, 30 Aug 2020 18:02:54 -0700 X-Received: by mo-csw.securemx.jp (mx-mo-csw1115) id 07V12nVf025835; Mon, 31 Aug 2020 10:02:49 +0900 X-Iguazu-Qid: 2wGqzHwiyhM6YIU5tg X-Iguazu-QSIG: v=2; s=0; t=1598835769; q=2wGqzHwiyhM6YIU5tg; m=3bEip78Rc36WzhwZC4/aWDKWuAJZx5LXnt5YOdbQ7eE= X-Received: from imx12.toshiba.co.jp (imx12.toshiba.co.jp [61.202.160.132]) by relay.securemx.jp (mx-mr1112) id 07V12mRI039058; Mon, 31 Aug 2020 10:02:48 +0900 X-Received: from enc02.toshiba.co.jp ([61.202.160.51]) by imx12.toshiba.co.jp with ESMTP id 07V12mWr005404; Mon, 31 Aug 2020 10:02:48 +0900 (JST) X-Received: from hop101.toshiba.co.jp ([133.199.85.107]) by enc02.toshiba.co.jp with ESMTP id 07V12lWQ017066; Mon, 31 Aug 2020 10:02:47 +0900 From: "Nobuhiro Iwamatsu" To: cip-dev@lists.cip-project.org Cc: jan.kiszka@siemens.com, Nobuhiro Iwamatsu Subject: [cip-dev] [isar-cip-core][PATCH] ci: Change to single job Date: Mon, 31 Aug 2020 10:02:44 +0900 X-TSB-HOP: ON Message-Id: <20200831010244.2629769-1-nobuhiro1.iwamatsu@toshiba.co.jp> 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: 7wBMqxrM3MjS1xYtdhGvwAevx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1598835775; bh=1ZWsu/wx/IGBCPK2dhrFMEdFIc2RV66TjPfnJ0ejdIg=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=EGu+8dXtIq5sHm/fHtW45E+8+jc2hsF3j7NsAtBUcpXtXehH6OdJ338+xrvBWlKSKcg SWlpCuZthQXtxVI+/pEz9iMs3wJ8c9JoMYP3MD2V3E+MkYw+1IubnZIcGgIyqq2zT4VmI HXHdVLwlmN4aellVMrB2nFHJwM8/aqAU6Io= Signed-off-by: Nobuhiro Iwamatsu --- .gitlab-ci.yml | 122 +++++++++++++------------------------------------ 1 file changed, 32 insertions(+), 90 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 802dbcd..5bd4774 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,17 +2,10 @@ image: kasproject/kas-isar:1.1 variables: GIT_STRATEGY: clone - release: buster - extention: base - use_rt: enable - targz: enable - dtb: none -stages: - - build - -default: - before_script: +all: + stage: build + script: - export http_proxy=$HTTP_PROXY - export https_proxy=$HTTPS_PROXY - export ftp_proxy=$FTP_PROXY @@ -20,83 +13,32 @@ default: - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -.build_base: - stage: build - variables: - base_yaml: "kas-cip.yml:kas/board/${target}.yml" - script: - - sudo rm -rf build/tmp - - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi; - - 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} - -# base image -build:simatic-ipc227e-base: - extends: - - .build_base - variables: - target: simatic-ipc227e - -build:bbb-base: - extends: - - .build_base - variables: - target: bbb - dtb: am335x-boneblack.dtb - -build:iwg20m-base: - extends: - - .build_base - variables: - target: iwg20m - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb - -build:hihope-rzg2m-base: - extends: - - .build_base - variables: - target: rzg2m - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb - -build:qemu-amd64-base: - extends: - - .build_base - variables: - target: qemu-amd64 - extention: security - use_rt: disable - targz: disable - -# test -build:simatic-ipc227e-test: - extends: - - .build_base - variables: - target: simatic-ipc227e - extention: test - -build:bbb-test: - extends: - - .build_base - variables: - target: bbb - extention: test - dtb: am335x-boneblack.dtb - -build:iwg20m-test: - extends: - - .build_base - variables: - target: iwg20m - extention: test - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb - -build:hihope-rzg2m-test: - extends: - - .build_base - variables: - target: rzg2m - extention: test - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb + # simatic-ipc227e + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster simatic-ipc227e base none + # bbb + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster bbb base am335x-boneblack.dtb + # iwg20m + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster iwg20m base r8a7743-iwg20d-q7-dbcm-ca.dtb + # rzg2m + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster rzg2m base renesas/r8a774a1-hihope-rzg2m-ex.dtb + + # qemu-amd64 / security + - kas build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml + - scripts/deploy-cip-core.sh buster qemu-amd64 security base + + # simatic-ipc227e / test + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster simatic-ipc227e test none + # bbb / test + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster bbb test am335x-boneblack.dtb + # iwg20m / test + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster iwg20m test r8a7743-iwg20d-q7-dbcm-ca.dtb + # rzg2m / test + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster rzg2m test renesas/r8a774a1-hihope-rzg2m-ex.dtb