diff mbox series

[isar-cip-core,3/3] ci: Rename empty extension case

Message ID 4259a1fd031036e3f9f075044984565c319d6588.1662040151.git.jan.kiszka@siemens.com (mailing list archive)
State Handled Elsewhere
Headers show
Series CI fixes and cleanups | expand

Commit Message

Jan Kiszka Sept. 1, 2022, 1:49 p.m. UTC 
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 mbox series

Patch

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