Skip to content

fix: handle yum failures when resolving kernel version #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrewwhitecdw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle yum failures when resolving kernel version #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions rhel8/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,12 @@ _resolve_rhel_version() {
# Resolve the kernel version to the form major.minor.patch-revision.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."
local version=$(yum -q list available --showduplicates kernel-headers |
awk -v arch=$(uname -m) 'NR>1 {print $2"."arch}' | tac | grep -E -m1 "^${KERNEL_VERSION/latest/.*}")
local version
if ! version=$(yum -q list available --showduplicates kernel-headers |
awk -v arch=$(uname -m) 'NR>1 {print $2"."arch}' | tac | grep -E -m1 "^${KERNEL_VERSION/latest/.*}"); then
echo "Could not resolve Linux kernel version" >&2
return 1
fi

if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
Expand Down
37 changes: 37 additions & 0 deletions tests/test_resolve_kernel_version_yum_failure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash
set -euo pipefail

cd "$(dirname "$0")/.."

tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' EXIT

cp rhel8/nvidia-driver "$tmp/lib.sh"
sed -i '/^usage() {/,$d' "$tmp/lib.sh"
: > "$tmp/common.sh"

export DRIVER_VERSION="550.54.15"
export TARGETARCH="amd64"
export KERNEL_VERSION="4.18.0-513.el8_9.x86_64"
export DRIVER_BRANCH=550

set +e
output=$(
cd "$tmp"
. ./lib.sh >/dev/null 2>&1
yum() { return 1; }
if ! _resolve_kernel_version 2>&1; then
echo "HANDLED"
fi
echo "MARKER"
)
status=$?
set -e

if [[ $status -ne 0 ]]; then
echo "FAIL: _resolve_kernel_version caused an early exit (status=$status)"
exit 1
fi
if [[ "$output" == *"Could not resolve Linux kernel version"* && "$output" == *"HANDLED"* && "$output" == *"MARKER"* ]]; then
echo "PASS: _resolve_kernel_version handles yum failure"
else