From f5dcd03e98cd062ae09e84707e3cc1954eaf6fe3 Mon Sep 17 00:00:00 2001 From: Zygmunt Krynicki Date: Thu, 30 May 2024 11:45:20 +0200 Subject: [PATCH] [PATCH 15/18] packaging: cope with unset ID and VERSION_ID There is no guarantee that ID and VERSION_ID are set in /etc/os-release. Provide defaults for ID and VERSION_ID so that spread runs with _some_ system name. Spread rejects system names with two consecutive dashes, so use a special-case for unset VERSION_ID since we know it is used in a context of the Debian archive. Signed-off-by: Zygmunt Krynicki Gbp-Pq: Name 0016-PATCH-15-18-packaging-cope-with-unset-ID-and-VERSION.patch --- packaging/debian-sid/tests/integrationtests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/debian-sid/tests/integrationtests b/packaging/debian-sid/tests/integrationtests index eee0d334..3751b713 100644 --- a/packaging/debian-sid/tests/integrationtests +++ b/packaging/debian-sid/tests/integrationtests @@ -44,7 +44,7 @@ snap install --classic go . /etc/os-release export GOPATH=/tmp/go /snap/bin/go install github.com/snapcore/spread/cmd/spread@latest -/tmp/go/bin/spread -v "autopkgtest:${ID}-${VERSION_ID}-$(dpkg --print-architecture)":tests/smoke/ +/tmp/go/bin/spread -v "autopkgtest:${ID:-linux}-${VERSION_ID:-sid}-$(dpkg --print-architecture)":tests/smoke/ # store journal info for inspectsion journalctl --sync -- 2.30.2