* [isar-cip-core][PATCH 0/3] CI fixes and cleanups
@ 2022-09-01 13:49 Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 1/3] ci: Switch qemu-amd64-secure-boot-buster to 5.10 kernel Jan Kiszka
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jan Kiszka @ 2022-09-01 13:49 UTC (permalink / raw)
To: cip-dev
See patches for details.
Jan
Jan Kiszka (3):
ci: Switch qemu-amd64-secure-boot-buster to 5.10 kernel
ci: Clean up redundant statements
ci: Rename empty extension case
.gitlab-ci.yml | 11 +++--------
scripts/deploy-cip-core.sh | 2 +-
2 files changed, 4 insertions(+), 9 deletions(-)
--
2.35.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* [isar-cip-core][PATCH 1/3] ci: Switch qemu-amd64-secure-boot-buster to 5.10 kernel
2022-09-01 13:49 [isar-cip-core][PATCH 0/3] CI fixes and cleanups Jan Kiszka
@ 2022-09-01 13:49 ` Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 2/3] ci: Clean up redundant statements Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 3/3] ci: Rename empty extension case Jan Kiszka
2 siblings, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2022-09-01 13:49 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
Since 05dd963af058, 4.19 and older are no longer supported for SWUpdate
and secure boot setups. Adjust the configuration accordingly, also
because it is now failing to build this invalid combination.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41af3e9..477ec63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -278,6 +278,7 @@ build:qemu-amd64-secure-boot-buster:
extends:
- .build_base
variables:
+ base_yaml: "kas-cip.yml:kas/board/${target}.yml:kas/opt/5.10.yml"
release: buster
target: qemu-amd64
extension: ebg-secure-boot-snakeoil
--
2.35.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [isar-cip-core][PATCH 2/3] ci: Clean up redundant statements
2022-09-01 13:49 [isar-cip-core][PATCH 0/3] CI fixes and cleanups Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 1/3] ci: Switch qemu-amd64-secure-boot-buster to 5.10 kernel Jan Kiszka
@ 2022-09-01 13:49 ` Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 3/3] ci: Rename empty extension case Jan Kiszka
2 siblings, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2022-09-01 13:49 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
We neither need to delete build/tmp anymore (since 3510f8a66f80), nor do
we need to set variables to the same value as their default.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 477ec63..593aee7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,6 @@ default:
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 [ "${extension}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.yml"; fi
- if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi
@@ -204,7 +203,6 @@ build:qemu-amd64-secure-boot:
extension: ebg-secure-boot-snakeoil
use_rt: disable
wic_targz: disable
- targz: disable
deploy: disable
build:qemu-amd64-swupdate:
@@ -215,7 +213,6 @@ build:qemu-amd64-swupdate:
extension: ebg-swu
use_rt: disable
wic_targz: disable
- targz: disable
deploy: disable
# secure boot images arm64
@@ -227,7 +224,6 @@ build:qemu-arm64-secure-boot:
extension: ebg-secure-boot-snakeoil
use_rt: disable
wic_targz: disable
- targz: disable
deploy: disable
# secure boot images arm
@@ -239,7 +235,6 @@ build:qemu-arm-secure-boot:
extension: ebg-secure-boot-snakeoil
use_rt: disable
wic_targz: disable
- targz: disable
deploy: disable
# buster images
@@ -284,5 +279,4 @@ build:qemu-amd64-secure-boot-buster:
extension: ebg-secure-boot-snakeoil
use_rt: disable
wic_targz: disable
- targz: disable
deploy: disable
--
2.35.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [isar-cip-core][PATCH 3/3] ci: Rename empty extension case
2022-09-01 13:49 [isar-cip-core][PATCH 0/3] CI fixes and cleanups Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 1/3] ci: Switch qemu-amd64-secure-boot-buster to 5.10 kernel Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 2/3] ci: Clean up redundant statements Jan Kiszka
@ 2022-09-01 13:49 ` Jan Kiszka
2 siblings, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2022-09-01 13:49 UTC (permalink / raw)
To: cip-dev
From: Jan Kiszka <jan.kiszka@siemens.com>
"none" is clearer than "base".
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 4 ++--
scripts/deploy-cip-core.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 593aee7..81301e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: ghcr.io/siemens/kas/kas-isar:3.0.2
variables:
GIT_STRATEGY: clone
release: bullseye
- extension: base
+ extension: none
use_rt: enable
wic_targz: enable
targz: disable
@@ -31,7 +31,7 @@ default:
base_yaml: "kas-cip.yml:kas/board/${target}.yml"
script:
- if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi
- - if [ "${extension}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.yml"; fi
+ - if [ "${extension}" != "none" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.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 [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi
diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh
index 01aa494..1eb93d5 100755
--- a/scripts/deploy-cip-core.sh
+++ b/scripts/deploy-cip-core.sh
@@ -17,7 +17,7 @@ DTB=$4
REF=$5
BASE_FILENAME=cip-core-image-cip-core-$RELEASE-$TARGET
-if [ "${EXTENSION}" != "base" ] ; then
+if [ "${EXTENSION}" != "none" ] ; then
if [ "${EXTENSION}" = "security" ] ; then
BASE_FILENAME=cip-core-image-$EXTENSION-cip-core-$RELEASE-$TARGET
else
--
2.35.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-01 13:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-01 13:49 [isar-cip-core][PATCH 0/3] CI fixes and cleanups Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 1/3] ci: Switch qemu-amd64-secure-boot-buster to 5.10 kernel Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 2/3] ci: Clean up redundant statements Jan Kiszka
2022-09-01 13:49 ` [isar-cip-core][PATCH 3/3] ci: Rename empty extension case 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.