From dae131cd7179826b261ceed6ac6908b6460aa029 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Wed, 2 Dec 2020 23:03:42 +0100
Subject: [PATCH] flatdeb-builder: Fix test by not hardcoding the release name
Rather than hardcoding the release name in the filename of the YAML
definition of the APT suite, generate it at runtime so that we can
also inherit the osname and APT mirror from the main settings, which
is useful for downstreams.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
.gitlab-ci.yml | 4 ++++
flatdeb-builder/suites/{v2022dev0.yaml => default.yaml.tpl} | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
rename flatdeb-builder/suites/{v2022dev0.yaml => default.yaml.tpl} (64%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 286bc31..53eb2b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -153,6 +153,10 @@ test-flatdeb-builder:
entrypoint: [ "" ]
script:
- cd flatdeb-builder/
+ - cat suites/default.yaml.tpl | sed
+ -e "s|%MIRROR%|${MIRROR}|g"
+ -e "s|%DISTRO%|${DISTRO}|g"
+ | tee "suites/${RELEASE}.yaml"
- /opt/apertis-flatdeb/run.py --build-area=$(pwd)/flatdeb-builddir --ostree-repo=$(pwd)/flatdeb-builddir/ostree-repo --suite=${RELEASE} --arch=amd64 base
publish-base-docker-image:
diff --git a/flatdeb-builder/suites/v2022dev0.yaml b/flatdeb-builder/suites/default.yaml.tpl
similarity index 64%
rename from flatdeb-builder/suites/v2022dev0.yaml
rename to flatdeb-builder/suites/default.yaml.tpl
index 92e8937..743cb77 100644
--- a/flatdeb-builder/suites/v2022dev0.yaml
+++ b/flatdeb-builder/suites/default.yaml.tpl
@@ -3,8 +3,8 @@ can_merge_usr: true
has_automatic_dbgsym: true
strip_source_version_suffix: bv20\d\d.*b\d+|b\w\d+
sources:
- - label: apertis-target
- apt_uri: 'https://repositories.apertis.org/apertis/'
+ - label: %DISTRO%-target
+ apt_uri: '%MIRROR%'
apt_components:
- target
...
--
GitLab