From: "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>
To: cip-dev@lists.cip-project.org
Cc: jan.kiszka@siemens.com,
Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Subject: [cip-dev] [PATCH] ci: Change to single job
Date: Mon, 31 Aug 2020 08:31:30 +0900 [thread overview]
Message-ID: <20200830233130.2618199-1-nobuhiro1.iwamatsu@toshiba.co.jp> (raw)
[-- Attachment #1: Type: text/plain, Size: 4310 bytes --]
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
.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
--
2.27.0
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5329): https://lists.cip-project.org/g/cip-dev/message/5329
Mute This Topic: https://lists.cip-project.org/mt/76524627/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
reply other threads:[~2020-08-30 23:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200830233130.2618199-1-nobuhiro1.iwamatsu@toshiba.co.jp \
--to=nobuhiro1.iwamatsu@toshiba.co.jp \
--cc=cip-dev@lists.cip-project.org \
--cc=jan.kiszka@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).