azlinux3 dnf packages for compiler installation

VERSION

@@ -1 +1 @@
-1.16.19
+1.16.20

src/VirtualClient/VirtualClient.Actions.FunctionalTests/CoreMarkProfileTests.cs

@@ -177,7 +177,8 @@ public async Task CoreMarkProWorkloadProfileExecutesTheExpectedWorkloadsOnWindow
             this.mockFixture.SetupLinuxPackagesInstalled(new Dictionary<string, string>
             {
                 { "gcc", "10" }, // Should match profile defaults.
-                { "cc", "10" }
+                { "cc", "10" },
+                { "gfortran", "10" }
             });
 
             this.mockFixture.ProcessManager.OnGetProcess = (id) => null;

src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpuExecutorTests.cs

@@ -10,6 +10,7 @@ namespace VirtualClient.Actions
     using System.IO.Abstractions;
     using System.Linq;
     using System.Reflection;
+    using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
     using global::VirtualClient;
@@ -55,6 +56,7 @@ public async Task SpecCpuExecutorExecutesTheCorrectCommandsWithInstallationInLin
             {
                 $"sudo mount -t iso9660 -o ro,exec,loop {this.mockPackage.Path}/speccpu.iso {this.mockFixture.GetPackagePath()}/speccpu_mount",
                 $"sudo ./install.sh -f -d {this.mockPackage.Path}",
+                $"sudo gcc -dumpversion",
                 $"sudo chmod -R ugo=rwx {this.mockPackage.Path}",
                 $"sudo umount {this.mockFixture.GetPackagePath()}/speccpu_mount",
                 $"sudo bash runspeccpu.sh \"--config vc-linux-x64.cfg --iterations 2 --copies 4 --threads 8 --tune all --reportable intrate\""
@@ -66,25 +68,43 @@ public async Task SpecCpuExecutorExecutesTheCorrectCommandsWithInstallationInLin
                 Assert.AreEqual(expectedCommands.ElementAt(processCount), $"{exe} {arguments}");
                 processCount++;
 
-                return new InMemoryProcess
+                if (exe == "sudo" && arguments == "gcc -dumpversion")
                 {
-                    StartInfo = new ProcessStartInfo
+                    return new InMemoryProcess
                     {
-                        FileName = exe,
-                        Arguments = arguments
-                    },
-                    ExitCode = 0,
-                    OnStart = () => true,
-                    OnHasExited = () => true
-                };
+                        StartInfo = new ProcessStartInfo
+                        {
+                            FileName = exe,
+                            Arguments = arguments
+                        },
+                        StandardOutput = new ConcurrentBuffer(new StringBuilder("10")),
+                        ExitCode = 0,
+                        OnStart = () => true,
+                        OnHasExited = () => true
+                    };
+                }
+                else
+                {
+                    return new InMemoryProcess
+                    {
+                        StartInfo = new ProcessStartInfo
+                        {
+                            FileName = exe,
+                            Arguments = arguments
+                        },
+                        ExitCode = 0,
+                        OnStart = () => true,
+                        OnHasExited = () => true
+                    };
+                }
             };
 
             using (TestSpecCpuExecutor specCpuExecutor = new TestSpecCpuExecutor(this.mockFixture.Dependencies, this.mockFixture.Parameters))
             {
                 await specCpuExecutor.ExecuteAsync(CancellationToken.None).ConfigureAwait(false);
             }
 
-            Assert.AreEqual(5, processCount);
+            Assert.AreEqual(expectedCommands.Count, processCount);
         }
 
         [Test]
@@ -99,6 +119,7 @@ public async Task SpecCpuExecutorExecutesTheCorrectCommandsWithInstallationInWin
                 $"powershell -Command \"Mount-DiskImage -ImagePath {this.mockPackage.Path}\\speccpu.iso\"",
                 $"powershell -Command \"(Get-DiskImage -ImagePath {this.mockPackage.Path}\\speccpu.iso| Get-Volume).DriveLetter\"",
                 $"cmd /c echo 1 | X:\\install.bat {this.mockPackage.Path}",
+                "gcc -dumpversion",
                 $"powershell -Command \"Dismount-DiskImage -ImagePath {this.mockPackage.Path}\\speccpu.iso\"",
                 $"cmd /c runspeccpu.bat --config vc-win-x64.cfg --iterations 2 --copies 4 --threads 8 --tune all --noreportable intrate"
             };
@@ -114,26 +135,44 @@ public async Task SpecCpuExecutorExecutesTheCorrectCommandsWithInstallationInWin
                     output.Append("X");
                 }
 
-                return new InMemoryProcess
+                if (exe == "gcc" && arguments == "-dumpversion")
                 {
-                    StartInfo = new ProcessStartInfo
+                    return new InMemoryProcess
                     {
-                        FileName = exe,
-                        Arguments = arguments
-                    },
-                    ExitCode = 0,
-                    OnStart = () => true,
-                    OnHasExited = () => true,
-                    StandardOutput = output
-                };
+                        StartInfo = new ProcessStartInfo
+                        {
+                            FileName = exe,
+                            Arguments = arguments
+                        },
+                        ExitCode = 0,
+                        OnStart = () => true,
+                        OnHasExited = () => true,
+                        StandardOutput = new ConcurrentBuffer(new StringBuilder("10")),
+                    };
+                }
+                else
+                {
+                    return new InMemoryProcess
+                    {
+                        StartInfo = new ProcessStartInfo
+                        {
+                            FileName = exe,
+                            Arguments = arguments
+                        },
+                        ExitCode = 0,
+                        OnStart = () => true,
+                        OnHasExited = () => true,
+                        StandardOutput = output
+                    };
+                }
             };
 
             using (TestSpecCpuExecutor specCpuExecutor = new TestSpecCpuExecutor(this.mockFixture.Dependencies, this.mockFixture.Parameters))
             {
                 await specCpuExecutor.ExecuteAsync(CancellationToken.None).ConfigureAwait(false);
             }
 
-            Assert.AreEqual(5, processCount);
+            Assert.AreEqual(processCount, expectedCommands.Count);
         }
 
         [Test]
@@ -273,7 +312,7 @@ public async Task SpecCpuExecutorExecutesTheCorrectCommandsWithDifferentProfiles
                 {
                     commandCalled = true;
                 }
-
+                
                 return new InMemoryProcess
                 {
                     StartInfo = new ProcessStartInfo
@@ -353,7 +392,6 @@ private void SetupLinux()
 
             this.mockFixture.Parameters = new Dictionary<string, IConvertible>()
             {
-                { nameof(SpecCpuExecutor.CompilerVersion), "10" },
                 { nameof(SpecCpuExecutor.SpecProfile), "intrate" },
                 { nameof(SpecCpuExecutor.PackageName), "speccpu" },
                 { nameof(SpecCpuExecutor.RunPeak), true },
@@ -385,7 +423,6 @@ private void SetupWindows()
 
             this.mockFixture.Parameters = new Dictionary<string, IConvertible>()
             {
-                { nameof(SpecCpuExecutor.CompilerVersion), "10" },
                 { nameof(SpecCpuExecutor.SpecProfile), "intrate" },
                 { nameof(SpecCpuExecutor.PackageName), "speccpu" },
                 { nameof(SpecCpuExecutor.RunPeak), true },

src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs

@@ -19,6 +19,7 @@ namespace VirtualClient.Actions
     using global::VirtualClient.Contracts;
     using Microsoft.Extensions.DependencyInjection;
     using VirtualClient.Contracts.Metadata;
+    using VirtualClient.Metadata;
 
     /// <summary>
     /// The SpecCpu workload executor.
@@ -86,17 +87,6 @@ public string BaseOptimizingFlags
             }
         }
 
-        /// <summary>
-        /// Compiler version
-        /// </summary>
-        public string CompilerVersion
-        {
-            get
-            {
-                return this.Parameters.GetValue<string>(nameof(SpecCpuExecutor.CompilerVersion));
-            }
-        }
-
         /// <summary>
         /// Iterations.
         /// Recommand Default: 2
@@ -432,16 +422,50 @@ private async Task WriteSpecCpuConfigAsync(CancellationToken cancellationToken)
                 true);
             }
 
+            string compilerVersion = await this.GetInstalledCompilerDumpVersionAsync("gcc", cancellationToken);
+
+            if (string.IsNullOrEmpty(compilerVersion))
+            {
+                throw new WorkloadException("gcc version not found.");
+            }
+
             templateText = templateText.Replace(SpecCpuConfigPlaceHolder.BaseOptimizingFlags, this.BaseOptimizingFlags, StringComparison.OrdinalIgnoreCase);
             templateText = templateText.Replace(SpecCpuConfigPlaceHolder.PeakOptimizingFlags, this.PeakOptimizingFlags, StringComparison.OrdinalIgnoreCase);
             templateText = templateText.Replace(
                 SpecCpuConfigPlaceHolder.Gcc10Workaround,
-                Convert.ToInt32(this.CompilerVersion) >= 10 ? SpecCpuConfigPlaceHolder.Gcc10WorkaroundContent : string.Empty,
+                Convert.ToInt32(compilerVersion) >= 10 ? SpecCpuConfigPlaceHolder.Gcc10WorkaroundContent : string.Empty,
                 StringComparison.OrdinalIgnoreCase);
 
             await this.fileSystem.File.WriteAllTextAsync(this.Combine(this.PackageDirectory, "config", configurationFile), templateText, cancellationToken);
         }
 
+        private async Task<string> GetInstalledCompilerDumpVersionAsync(string compilerName, CancellationToken cancellationToken)
+        {
+            string command = compilerName;
+            string commandArguments = "-dumpversion";
+
+            string version = string.Empty;
+
+            using (IProcessProxy process = this.systemManager.ProcessManager.CreateElevatedProcess(this.Platform, command, commandArguments))
+            {
+                try
+                {
+                    await process.StartAndWaitAsync(cancellationToken);
+
+                    if (!cancellationToken.IsCancellationRequested)
+                    {
+                        version = process.StandardOutput.ToString().Trim().Split(".")[0];
+                    }
+                }
+                catch
+                {
+                    version = string.Empty;
+                }
+            }
+
+            return version;
+        }
+
         internal class SpecCpuState : State
         {
             public SpecCpuState(IDictionary<string, IConvertible> properties = null)