summaryrefslogtreecommitdiff
path: root/contrib/cirrus/logcollector.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-11-12 09:10:18 -0500
committerChris Evich <cevich@redhat.com>2020-12-15 18:49:09 -0500
commite3ba7092fbdc5f49efb763de03aa08705726e30c (patch)
tree35bcafc8fe13d147574618424cdef8ba6c83e705 /contrib/cirrus/logcollector.sh
parent66e979a892df7dc820e6ce7ada0e3a34619c172f (diff)
downloadpodman-e3ba7092fbdc5f49efb763de03aa08705726e30c.tar.gz
podman-e3ba7092fbdc5f49efb763de03aa08705726e30c.tar.bz2
podman-e3ba7092fbdc5f49efb763de03aa08705726e30c.zip
Cirrus: Add support for Ubuntu 20.x
Previously automation always dropped the minor version number for distributions. This was intended for presentation and conditional simplicity. Bash does not support non-integer comparison natively. With the release of version 20.10, supporting testing with it and the LTS release (20.04) requires scripts to consider minor version numbers for Ubuntu VMs. This is necessary because many times in the past, some behaviors needed to be conditional on the release version number. With this commit, the images and embedded scripts/tooling uses an altered format of `$UBUNTU_NAME', `$PRIOR_UBUNTU_NAME`, and (crucially) `$OS_RELEASE_VER` and `$OS_REL_VER`. Any `.` characters appearing in the official version (from `/etc/os-release`) are dropped, and the result is concatenated. For example the current Ubuntu LTS version is `20.04`. Prior to this commit, `$OS_RELEASE_VER` would have been `20`. With this change, `$OS_RELEASE_VER` will now show `2004`. Similarly `20.10` is shown as `2010`. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/logcollector.sh')
-rwxr-xr-xcontrib/cirrus/logcollector.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 7bf651b36..323015cef 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -53,7 +53,7 @@ case $1 in
slirp4netns \
)
case $OS_RELEASE_ID in
- fedora*)
+ fedora)
cat /etc/fedora-release
PKG_LST_CMD='rpm -q --qf=%{N}-%{V}-%{R}-%{ARCH}\n'
PKG_NAMES+=(\
@@ -61,7 +61,7 @@ case $1 in
libseccomp \
)
;;
- ubuntu*)
+ ubuntu)
cat /etc/issue
PKG_LST_CMD='dpkg-query --show --showformat=${Package}-${Version}-${Architecture}\n'
PKG_NAMES+=(\