diff options
| author | Chris Evich <cevich@redhat.com> | 2020-11-12 09:10:18 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-12-15 18:49:09 -0500 |
| commit | e3ba7092fbdc5f49efb763de03aa08705726e30c (patch) | |
| tree | 35bcafc8fe13d147574618424cdef8ba6c83e705 /contrib/cirrus/lib.sh | |
| parent | 66e979a892df7dc820e6ce7ada0e3a34619c172f (diff) | |
| download | podman-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/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 01e75d9a6..ea47c554a 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -41,7 +41,7 @@ fi OS_RELEASE_ID="$(source /etc/os-release; echo $ID)" # GCE image-name compatible string representation of distribution _major_ version -OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | cut -d '.' -f 1)" +OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | tr -d '.')" # Combined to ease soe usage OS_REL_VER="${OS_RELEASE_ID}-${OS_RELEASE_VER}" # This is normally set from .cirrus.yml but default is necessary when |