Skip to content

Commit f51305d

Browse files
saibulususaibulusu
saibulusu
and
saibulusu
authored
fio profiles fixes (#557)
* Removing libaio-dev(el), moving linux package installation prior to disk initialization. * Including fio-eengine-libaio for dnf packages. * Removing unneeded package. * Fixing a unit test. --------- Co-authored-by: saibulusu <[email protected]>
1 parent fd7cc90 commit f51305d

File tree

7 files changed

+40
-44
lines changed

7 files changed

+40
-44
lines changed

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioDiscoveryProfileTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public async Task FioDiscoveryWorkloadProfileInstallsTheExpectedDependenciesOnUn
5656

5757
// Apt packages expectations
5858
// There are a few Apt packages that must be installed for the FIO workload to run.
59-
WorkloadAssert.AptPackageInstalled(this.mockFixture, "libaio-dev");
6059
WorkloadAssert.AptPackageInstalled(this.mockFixture, "fio");
6160
}
6261
}

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioMultiThroughputProfileTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace VirtualClient.Actions
1111
using System.Threading.Tasks;
1212
using NUnit.Framework;
1313
using VirtualClient.Common;
14-
using VirtualClient.Common.Extensions;
1514
using VirtualClient.Contracts;
1615

1716
[TestFixture]
@@ -58,7 +57,6 @@ public async Task FioWorkloadMultiThroughputProfileInstallsTheExpectedDependenci
5857

5958
// Apt packages expectations
6059
// There are a few Apt packages that must be installed for the FIO workload to run.
61-
WorkloadAssert.AptPackageInstalled(this.mockFixture, "libaio-dev");
6260
WorkloadAssert.AptPackageInstalled(this.mockFixture, "fio");
6361
}
6462
}

‎src/VirtualClient/VirtualClient.Actions.FunctionalTests/FioProfileTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public async Task FioWorkloadProfileInstallsTheExpectedDependenciesOnUnixPlatfor
7979

8080
// Apt packages expectations
8181
// There are a few Apt packages that must be installed for the FIO workload to run.
82-
WorkloadAssert.AptPackageInstalled(this.mockFixture, "libaio-dev");
8382
WorkloadAssert.AptPackageInstalled(this.mockFixture, "fio");
8483
}
8584
}

‎src/VirtualClient/VirtualClient.Main/profiles/PERF-IO-FIO-DISCOVERY.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,16 @@
514514
}
515515
],
516516
"Dependencies": [
517+
{
518+
"Type": "LinuxPackageInstallation",
519+
"Parameters": {
520+
"Scenario": "InstallLinuxPackages",
521+
"Packages-Apt": "fio",
522+
"Packages-Dnf": "fio,lshw,parted",
523+
"Packages-Yum": "fio",
524+
"Packages-Zypper": "fio"
525+
}
526+
},
517527
{
518528
"Type": "FormatDisks",
519529
"Parameters": {
@@ -527,16 +537,6 @@
527537
"DiskFilter": "$.Parameters.DiskFilter"
528538
}
529539
},
530-
{
531-
"Type": "LinuxPackageInstallation",
532-
"Parameters": {
533-
"Scenario": "InstallLinuxPackages",
534-
"Packages-Apt": "fio,libaio-dev",
535-
"Packages-Dnf": "fio,libaio-devel,lshw,parted",
536-
"Packages-Yum": "fio,libaio-devel",
537-
"Packages-Zypper": "fio,libaio-dev"
538-
}
539-
},
540540
{
541541
"Type": "DependencyPackageInstallation",
542542
"Parameters": {

‎src/VirtualClient/VirtualClient.Main/profiles/PERF-IO-FIO-MULTITHROUGHPUT.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@
7474
}
7575
],
7676
"Dependencies": [
77+
{
78+
"Type": "LinuxPackageInstallation",
79+
"Parameters": {
80+
"Scenario": "InstallLinuxPackages",
81+
"Packages-Apt": "fio",
82+
"Packages-Dnf": "fio,lshw,parted",
83+
"Packages-Yum": "fio",
84+
"Packages-Zypper": "fio"
85+
}
86+
},
7787
{
7888
"Type": "FormatDisks",
7989
"Parameters": {
@@ -87,16 +97,6 @@
8797
"DiskFilter": "$.Parameters.DiskFilter"
8898
}
8999
},
90-
{
91-
"Type": "LinuxPackageInstallation",
92-
"Parameters": {
93-
"Scenario": "InstallLinuxPackages",
94-
"Packages-Apt": "fio,libaio-dev",
95-
"Packages-Dnf": "fio,libaio-devel,lshw,parted",
96-
"Packages-Yum": "fio,libaio-devel",
97-
"Packages-Zypper": "fio,libaio-dev"
98-
}
99-
},
100100
{
101101
"Type": "DependencyPackageInstallation",
102102
"Parameters": {

‎src/VirtualClient/VirtualClient.Main/profiles/PERF-IO-FIO-OLTP.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,16 @@
188188
}
189189
],
190190
"Dependencies": [
191+
{
192+
"Type": "LinuxPackageInstallation",
193+
"Parameters": {
194+
"Scenario": "InstallLinuxPackages",
195+
"Packages-Apt": "fio",
196+
"Packages-Dnf": "fio,lshw,parted",
197+
"Packages-Yum": "fio",
198+
"Packages-Zypper": "fio"
199+
}
200+
},
191201
{
192202
"Type": "FormatDisks",
193203
"Parameters": {
@@ -201,16 +211,6 @@
201211
"DiskFilter": "$.Parameters.DiskFilter"
202212
}
203213
},
204-
{
205-
"Type": "LinuxPackageInstallation",
206-
"Parameters": {
207-
"Scenario": "InstallLinuxPackages",
208-
"Packages-Apt": "fio,libaio-dev",
209-
"Packages-Dnf": "fio,libaio-devel,lshw,parted",
210-
"Packages-Yum": "fio,libaio-devel",
211-
"Packages-Zypper": "fio,libaio-dev"
212-
}
213-
},
214214
{
215215
"Type": "DependencyPackageInstallation",
216216
"Parameters": {

‎src/VirtualClient/VirtualClient.Main/profiles/PERF-IO-FIO.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,16 @@
491491
}
492492
],
493493
"Dependencies": [
494+
{
495+
"Type": "LinuxPackageInstallation",
496+
"Parameters": {
497+
"Scenario": "InstallLinuxPackages",
498+
"Packages-Apt": "fio",
499+
"Packages-Dnf": "fio,lshw,parted",
500+
"Packages-Yum": "fio",
501+
"Packages-Zypper": "fio"
502+
}
503+
},
494504
{
495505
"Type": "FormatDisks",
496506
"Parameters": {
@@ -504,16 +514,6 @@
504514
"DiskFilter": "$.Parameters.DiskFilter"
505515
}
506516
},
507-
{
508-
"Type": "LinuxPackageInstallation",
509-
"Parameters": {
510-
"Scenario": "InstallLinuxPackages",
511-
"Packages-Apt": "fio,libaio-dev",
512-
"Packages-Dnf": "fio,libaio-devel,lshw,parted",
513-
"Packages-Yum": "fio,libaio-devel",
514-
"Packages-Zypper": "fio,libaio-dev"
515-
}
516-
},
517517
{
518518
"Type": "DependencyPackageInstallation",
519519
"Parameters": {

0 commit comments

Comments
 (0)