Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.11
3.3.12
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ public async Task DeathStarBenchClientExecutorExecutesExpectedCommands_SocialNet
// exactly the same as what is executed.
$"sudo bash {this.mockPackage.Path}/linux-x64/scripts/dockerComposeScript.sh",
$"sudo chmod +x \"/usr/local/bin/docker-compose\"",
$"sudo apt install python3-venv -y",
$"sudo python3 -m venv {this.mockPackage.Path}/linux-x64/venv",
$"sudo {this.mockPackage.Path}/linux-x64/venv/bin/pip install -U pip",
$"sudo {this.mockPackage.Path}/linux-x64/venv/bin/pip install -U setuptools",
Expand Down Expand Up @@ -200,7 +199,6 @@ public async Task DeathStarBenchClientExecutorExecutesExpectedCommands_MediaMicr
$"sudo chmod +x \"{this.mockPackage.Path}/linux-x64/mediamicroservices/wrk2/deps/luajit/src/luajit\"",
$"sudo bash {this.mockPackage.Path}/linux-x64/scripts/dockerComposeScript.sh",
$"sudo chmod +x \"/usr/local/bin/docker-compose\"",
$"sudo apt install python3-venv -y",
$"sudo python3 -m venv {this.mockPackage.Path}/linux-x64/venv",
$"sudo {this.mockPackage.Path}/linux-x64/venv/bin/pip install -U pip",
$"sudo {this.mockPackage.Path}/linux-x64/venv/bin/pip install -U setuptools",
Expand Down Expand Up @@ -247,7 +245,6 @@ public async Task DeathStarBenchClientExecutorExecutesExpectedCommands_HotelRese
// exactly the same as what is executed.
$"sudo bash {this.mockPackage.Path}/linux-x64/scripts/dockerComposeScript.sh",
$"sudo chmod +x \"/usr/local/bin/docker-compose\"",
$"sudo apt install python3-venv -y",
$"sudo python3 -m venv {this.mockPackage.Path}/linux-x64/venv",
$"sudo {this.mockPackage.Path}/linux-x64/venv/bin/pip install -U pip",
$"sudo {this.mockPackage.Path}/linux-x64/venv/bin/pip install -U setuptools",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ public async Task DeathStarBenchExecutorInstallsDepedenciesAsExpected()
{
@"bash /home/user/tools/VirtualClient/packages/deathstarbench/linux-x64/scripts/dockerComposeScript.sh",
@"chmod +x ""/usr/local/bin/docker-compose""",
@"apt install python3-venv -y",
@"python3 -m venv /home/user/tools/VirtualClient/packages/deathstarbench/linux-x64/venv",
@"/home/user/tools/VirtualClient/packages/deathstarbench/linux-x64/venv/bin/pip install -U pip",
@"/home/user/tools/VirtualClient/packages/deathstarbench/linux-x64/venv/bin/pip install -U setuptools",
Expand All @@ -118,7 +117,7 @@ public async Task DeathStarBenchExecutorInstallsDepedenciesAsExpected()

await executor.OnInitialize(EventContext.None, CancellationToken.None);

Assert.AreEqual(8, executed);
Assert.AreEqual(7, executed);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -551,11 +551,8 @@ await this.ExecuteCommandAsync(dockerComposeCommand, this.PackageDirectory, canc
await this.SystemManager.MakeFileExecutableAsync(dockerComposeFilePath, this.Platform, cancellationToken)
.ConfigureAwait();

string installVenvCommand = "apt install python3-venv -y";
await this.ExecuteCommandAsync(installVenvCommand, this.PackageDirectory, cancellationToken)
.ConfigureAwait();

// Create Python virtual environment to isolate dependencies
// Create Python virtual environment to isolate dependencies.
// The python3-venv package is installed by the LinuxPackageInstallation dependency in the profile.
string venvPath = this.PlatformSpecifics.Combine(this.PackageDirectory, "venv");
string createVenvCommand = $"python3 -m venv {venvPath}";
await this.ExecuteCommandAsync(createVenvCommand, this.PackageDirectory, cancellationToken)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"Type": "LinuxPackageInstallation",
"Parameters": {
"Scenario": "InstallLinuxPackages",
"Packages-Apt": "python3-pip,libssl-dev,libz-dev,luarocks,libssl1.0.0,python3.12-venv"
"Packages-Apt": "python3-pip,libssl-dev,libz-dev,luarocks,libssl1.0.0,python3-venv"
}
},
{
Expand Down
Loading