Skip to content
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.

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

Include driverdog in vendor variants #2099

Merged
merged 1 commit into from
Apr 27, 2022

Conversation

arnaldo2792
Copy link
Contributor

Issue number:

N / A

Description of changes:

In preparation of #1074, we need to compile driverdog for NVIDIA variants, not just for aws-k8s-*-nvidia variants

Now `driverdog` will be included in all vendor variants regardless of
the orchestrator type.

Testing done:

  • In aws-k8s-1.21-nvidia I checked driverdog was included in the image and that link-kernel-modules.service and load-kernel-modules.service run as expected:
bash-5.1# apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "ad2484e4",
    "pretty_name": "Bottlerocket OS 1.7.2 (aws-k8s-1.21-nvidia)",
    "variant_id": "aws-k8s-1.21-nvidia",
    "version_id": "1.7.2"
  }
}
bash-5.1# systemctl status load-kernel-modules.service
● load-kernel-modules.service - Load additional kernel modules
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/load-kernel-modules.service; enabled; vendor preset: enabled)
     Active: active (exited) since Fri 2022-04-22 20:48:35 UTC; 3min 32s ago
   Main PID: 2699 (code=exited, status=0/SUCCESS)

Apr 22 20:48:33 localhost systemd[1]: Starting Load additional kernel modules...
Apr 22 20:48:35 ip-172-31-29-12.us-west-2.compute.internal driverdog[2699]: 20:48:35 [INFO] Updated modules dependencies
Apr 22 20:48:35 ip-172-31-29-12.us-west-2.compute.internal driverdog[2699]: 20:48:35 [INFO] Loaded kernel modules
Apr 22 20:48:35 ip-172-31-29-12.us-west-2.compute.internal systemd[1]: Finished Load additional kernel modules.
bash-5.1# systemctl status link-kernel-modules.service
● link-kernel-modules.service - Link additional kernel modules
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/link-kernel-modules.service; enabled; vendor preset: enabled)
     Active: active (exited) since Fri 2022-04-22 20:48:33 UTC; 3min 36s ago
   Main PID: 2605 (code=exited, status=0/SUCCESS)

Apr 22 20:48:31 localhost systemd[1]: Starting Link additional kernel modules...
Apr 22 20:48:32 localhost driverdog[2605]: 20:48:32 [INFO] Linked object 'nvidia.o'
Apr 22 20:48:32 localhost driverdog[2605]: 20:48:32 [INFO] Stripped object 'nvidia.o'
Apr 22 20:48:33 localhost driverdog[2605]: 20:48:33 [INFO] Linked object 'nvidia-modeset.o'
Apr 22 20:48:33 localhost driverdog[2605]: 20:48:33 [INFO] Stripped object 'nvidia-modeset.o'
Apr 22 20:48:33 localhost driverdog[2605]: 20:48:33 [INFO] Linked nvidia-uvm.ko
Apr 22 20:48:33 localhost driverdog[2605]: 20:48:33 [INFO] Linked nvidia-modeset.ko
Apr 22 20:48:33 localhost driverdog[2605]: 20:48:33 [INFO] Linked nvidia.ko
Apr 22 20:48:33 localhost systemd[1]: Finished Link additional kernel modules.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Now `driverdog` will be included in all vendor variants regardless of
the orchestrator type.

Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
@arnaldo2792 arnaldo2792 merged commit b49e272 into bottlerocket-os:develop Apr 27, 2022
@arnaldo2792 arnaldo2792 deleted the driverdog-vendor branch June 21, 2022 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants