Skip to content

Commit

Permalink
kola-denylist: drop ext.config.version.rhel-matches-rhcos-build
Browse files Browse the repository at this point in the history
This passes now.

While we're here, add some comments in the test.
  • Loading branch information
jlebon committed Mar 23, 2023
1 parent ff43b3c commit f85080a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 0 additions & 4 deletions kola-denylist.yaml
Expand Up @@ -16,10 +16,6 @@
arches:
- ppc64le

# Temporary while we're using C9S
- pattern: ext.config.version.rhel-matches-rhcos-build
tracker: ''

- pattern: ext.config.rpm-ostree.replace-rt-kernel
tracker: https://github.com/openshift/os/issues/1099

Expand Down
4 changes: 3 additions & 1 deletion tests/kola/version/rhel-matches-rhcos-build
Expand Up @@ -2,7 +2,7 @@
## kola:
## exclusive: false
#
# Check that the OS version (C9S, RHEL 9.0) matches the version stored in
# Check that the OS version (C9S, RHEL 9.x) matches the version stored in
# /etc/os-release

set -xeuo pipefail
Expand All @@ -13,9 +13,11 @@ ocp_version="$(source /etc/os-release; echo "${VERSION}")"
variant="$(source /etc/os-release; echo "${ID}")"
case "${variant}" in
"scos")
# on SCOS, this is just "9"
osver="$(source /usr/lib/os-release.stream; echo "${VERSION_ID}")"
;;
"rhcos")
# on RHCOS, this is e.g. "9.2"; we convert to "92"
osver="$(source /usr/lib/os-release.rhel; echo "${VERSION_ID}" | sed 's/\.//')"
;;
"*")
Expand Down

0 comments on commit f85080a

Please sign in to comment.