[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 <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0016-PATCH-15-18-packaging-cope-with-unset-ID-and-VERSION.patch

diff --git a/packaging/debian-sid/tests/integrationtests b/packaging/debian-sid/tests/integrationtests
index eee0d334b0f45d3b9e9e151f71dee097e979cf8a..3751b7130eff2a2f02f96f089f7e3d631a959d1b 100644 (file)
--- 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