From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Thu, 24 Sep 2020 15:46:31 +0000 (+0200)
Subject: Propagate OS ID to pytest
X-Git-Tag: 2.46.0~20^2^2~55^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f76fd93910ae78631593782052248e6a70cf7012;p=graphviz

Propagate OS ID to pytest
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90414abc5..5d6651b35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -159,6 +159,7 @@ portable-source:
     script:
         - ci/install-packages.sh
         - export GV_VERSION=$( cat VERSION )
+        - export OS_ID=$( cat OS_ID )
         - python3 -m pytest --junitxml=report.xml tests rtest
     artifacts:
         reports:
diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index ff6076c86..18db70e56 100755
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -10,6 +10,7 @@ else
     ID=$( cat /etc/redhat-release | cut -d' ' -f1 | tr 'A-Z' 'a-z' )
     VERSION_ID=$( cat /etc/redhat-release | cut -d' ' -f3  | cut -d'.' -f1 )
 fi
+printf '%s\n' "${ID}" >OS_ID
 GV_VERSION=$( cat VERSION )
 COLLECTION=$( cat COLLECTION )
 DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}