Message ID | 83d75816ceb5f74802ac0cec5292bf257ffc2d48.1598865682.git.jan.kiszka@siemens.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | ci fixes | expand |
Hi, > -----Original Message----- > From: Jan Kiszka [mailto:jan.kiszka@siemens.com] > Sent: Monday, August 31, 2020 6:21 PM > To: cip-dev@lists.cip-project.org > Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <nobuhiro1.iwamatsu@toshiba.co.jp> > Subject: [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image > > From: Jan Kiszka <jan.kiszka@siemens.com> > > 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 <jan.kiszka@siemens.com> I checked this patch. The problem has been fixed. Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Best regards, Nobuhiro > --- > .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: > -- > 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5343): https://lists.cip-project.org/g/cip-dev/message/5343 Mute This Topic: https://lists.cip-project.org/mt/76530563/4520428 Group Owner: cip-dev+owner@lists.cip-project.org Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy [patchwork-cip-dev@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-
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: