Make the OS name configurable

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

.gitlab-ci.yml

@@ -49,7 +49,7 @@ build-base-rootfs:
   script:
     - >
       cd base &&
-      debos -t suite:$RELEASE -t stable:$STABLE rootfs.yaml
+      debos -t osname:${DISTRO} -t suite:${RELEASE} -t stable:$STABLE rootfs.yaml
 
 .build-docker-image:
   image:
@@ -65,6 +65,7 @@ build-base-rootfs:
       --context $CI_PROJECT_DIR/$image
       --dockerfile $CI_PROJECT_DIR/$image/Dockerfile
       --destination $CI_REGISTRY_IMAGE/$RELEASE-$image:$TEST_TAG
+      --build-arg OSNAME=$DISTRO
       --build-arg RELEASE=$RELEASE
       --build-arg TAG=$TEST_TAG
       --build-arg REGISTRY=$CI_REGISTRY_IMAGE
@@ -140,7 +141,7 @@ test-image-builder:
     name: $CI_REGISTRY_IMAGE/${RELEASE}-image-builder:${TEST_TAG}
     entrypoint: [ "" ]
   script:
-    - debos -t suite:${RELEASE} image-builder/test-recipe.yaml
+    - debos -t osname:${DISTRO} -t suite:${RELEASE} image-builder/test-recipe.yaml
 
 test-flatdeb-builder:
   stage: image test

base/Dockerfile

@@ -18,7 +18,8 @@
 
 FROM scratch
 
-LABEL description="Apertis base image"
+ARG OSNAME=apertis
+LABEL description="$OSNAME base image"
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8

base/rootfs.yaml

@@ -4,6 +4,7 @@
 {{- $ospack := or .ospack "rootfs.tar.gz" -}}
 {{- $timestamp := or .timestamp "00000000.0" -}}
 {{- $stable := or .stable "" -}}
+{{- $osname := or .osname "apertis" -}}
 
 architecture: {{ $architecture }}
 
@@ -14,8 +15,8 @@ actions:
       - target
     mirror: {{ $mirror }}
     variant: minbase
-    keyring-package: apertis-archive-keyring
-    keyring-file: keyring/apertis-archive-keyring.gpg
+    keyring-package: {{ $osname }}-archive-keyring
+    keyring-file: keyring/{{ $osname }}-archive-keyring.gpg
     merged-usr: false
 
   - action: overlay
@@ -33,7 +34,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.chroot apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.chroot "$osname" {{ $suite }} {{ $timestamp }} collabora
 
   - action: pack
     compression: gz

image-builder/test-recipe.yaml

 {{- $architecture := or .architecture "arm64" }}
 {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
 {{- $suite := or .suite "v2021dev1" -}}
+{{- $osname := or .osname "apertis" -}}
 
 architecture: {{ $architecture }}
 
@@ -11,6 +12,6 @@ actions:
       - target
     mirror: {{ $mirror }}
     variant: minbase
-    keyring-package: apertis-archive-keyring
-    keyring-file: /etc/apt/trusted.gpg.d/apertis-archive-keyring.gpg
+    keyring-package: {{ $osname }}-archive-keyring
+    keyring-file: /etc/apt/trusted.gpg.d/{{ $osname }}-archive-keyring.gpg
     merged-usr: true