* [cip-dev] [isar-cip-core][PATCH] ci: Fix bullseye deployment
@ 2021-07-21 21:04 Jan Kiszka
0 siblings, 0 replies; only message in thread
From: Jan Kiszka @ 2021-07-21 21:04 UTC (permalink / raw)
To: cip-dev
[-- Attachment #1: Type: text/plain, Size: 2023 bytes --]
From: Jan Kiszka <jan.kiszka@siemens.com>
We actually already had a switch to select the release. So drop the
extra one for bullseye and use release, also fixing the deployment file
name this way.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 161916f..3e98f79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ variables:
wic_targz: enable
targz: disable
dtb: none
- bullseye: disable
deploy: enable
stages:
@@ -35,7 +34,7 @@ default:
- if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi;
- if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi;
- if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
- - if [ "${bullseye}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
+ - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
- kas build ${base_yaml}
- if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
@@ -196,7 +195,7 @@ build:simatic-ipc227e-bullseye:
- .build_base
variables:
target: simatic-ipc227e
- bullseye: enable
+ release: bullseye
build:bbb-bullseye:
extends:
@@ -204,7 +203,7 @@ build:bbb-bullseye:
variables:
target: bbb
dtb: am335x-boneblack.dtb
- bullseye: enable
+ release: bullseye
build:iwg20m-bullseye:
extends:
@@ -212,7 +211,7 @@ build:iwg20m-bullseye:
variables:
target: iwg20m
dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
- bullseye: enable
+ release: bullseye
build:hihope-rzg2m-bullseye:
extends:
@@ -220,4 +219,4 @@ build:hihope-rzg2m-bullseye:
variables:
target: hihope-rzg2m
dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
- bullseye: enable
+ release: bullseye
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 429 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6623): https://lists.cip-project.org/g/cip-dev/message/6623
Mute This Topic: https://lists.cip-project.org/mt/84366341/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-21 21:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-21 21:04 [cip-dev] [isar-cip-core][PATCH] ci: Fix bullseye deployment Jan Kiszka
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.