-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #288 from DataDog/paulcacheux/fix-ci-again
fix virtualbox not found in CI
- Loading branch information
Showing
2 changed files
with
30 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From f67d4f75eb2d97601df3cfe491ed4594422f190b Mon Sep 17 00:00:00 2001 | ||
From: Paul Cacheux <[email protected]> | ||
Date: Mon, 20 May 2024 14:50:01 +0200 | ||
Subject: [PATCH] virtualbox version detection: handle WARNING lines | ||
|
||
--- | ||
plugins/providers/virtualbox/driver/meta.rb | 6 +++++- | ||
1 file changed, 5 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb | ||
index 63af500c65a..413574e4125 100644 | ||
--- a/plugins/providers/virtualbox/driver/meta.rb | ||
+++ b/plugins/providers/virtualbox/driver/meta.rb | ||
@@ -197,7 +197,11 @@ def read_version | ||
end | ||
end | ||
|
||
- parts = output.split("_") | ||
+ version_line = output.each_line.find do |line| | ||
+ !line.start_with?("WARNING:") | ||
+ end | ||
+ | ||
+ parts = version_line.split("_") | ||
return nil if parts.empty? | ||
parts[0].split("r")[0] | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters