Revert "testing the linux native binaries in docker containers testing the linux native binaries in docker containers"

This reverts commit cabd57f38156dc925bcdef1a650383e3ac26d2bb.

Author: arturcic

build/artifacts-test.cake

@@ -3,7 +3,6 @@ singleStageRun = !IsEnabled(Context, "ENABLED_MULTI_STAGE_BUILD", false);
 Task("Artifacts-Prepare")
 .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-Prepare can be tested only on Windows or Linux agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-Prepare works only on Releasing CI.")
-    .IsDependentOnWhen("Zip-Files", singleStageRun)
     .IsDependentOnWhen("Pack-Nuget", singleStageRun)
     .Does<BuildParameters>((parameters) =>
 {
@@ -30,25 +29,6 @@ Task("Artifacts-DotnetTool-Test")
     }
 });
 
-Task("Artifacts-Native-Test")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnLinux, "Artifacts-Native-Test can be tested only on Linux agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI,    "Artifacts-Native-Test works only on Releasing CI.")
-    .IsDependentOn("Artifacts-Prepare")
-    .Does<BuildParameters>((parameters) =>
-{
-    var rootPrefix = parameters.DockerRootPrefix;
-    var version = parameters.Version.NugetVersion;
-
-    foreach(var dockerImage in parameters.Docker.Images)
-    {
-        var (os, distro, targetframework) = dockerImage;
-
-        var cmd = $"-file {rootPrefix}/scripts/Test-Native.ps1 -repoPath {rootPrefix}/repo -runtime {distro}";
-
-        DockerTestArtifact(dockerImage, parameters, cmd);
-    }
-});
-
 Task("Artifacts-MsBuildCore-Test")
     .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-MsBuildCore-Test can be tested only on Windows or Linux agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI,     "Artifacts-MsBuildCore-Test works only on Releasing CI.")
@@ -120,6 +100,5 @@ Task("Artifacts-MsBuildFull-Test")
 Task("Artifacts-Test")
     .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-Test can be tested only on Windows or Linux agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI,     "Artifacts-Test works only on Releasing CI.")
-    .IsDependentOn("Artifacts-Native-Test")
     .IsDependentOn("Artifacts-DotnetTool-Test")
     .IsDependentOn("Artifacts-MsBuildCore-Test");

build/pack.cake

@@ -154,11 +154,8 @@ void PackPrepareNative(ICakeContext context, BuildParameters parameters)
 
         context.Information("Validating native lib:");
 
-        // testing windows and macos artifacts, ther linux is tested with docker
-        if (platform != PlatformFamily.Linux)
-        {
-            var nativeExe = outputPath.CombineWithFilePath(IsRunningOnWindows() ? "gitversion.exe" : "gitversion");
-            ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", parameters.Version.GitVersion.FullSemVer);
-        }
+        var nativeExe = outputPath.CombineWithFilePath(IsRunningOnWindows() ? "gitversion.exe" : "gitversion");
+        ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", parameters.Version.GitVersion.FullSemVer);
     }
+
 }

build/utils/docker.cake

@@ -109,16 +109,14 @@ void DockerPullImage(DockerImage dockerImage, BuildParameters parameters)
 DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
 {
     var currentDir = MakeAbsolute(Directory("."));
-    var root = parameters.DockerRootPrefix;
     var settings = new DockerContainerRunSettings
     {
         Rm = true,
         Volume = new[]
         {
-            $"{currentDir}:{root}/repo",
-            $"{currentDir}/test-scripts:{root}/scripts",
-            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{root}/nuget",
-            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/native/linux:{root}/native",
+            $"{currentDir}:{parameters.DockerRootPrefix}/repo",
+            $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{parameters.DockerRootPrefix}/nuget",
+            $"{currentDir}/test-scripts:{parameters.DockerRootPrefix}/scripts"
         }
     };
 

build/utils/parameters.cake

@@ -141,7 +141,7 @@ public class BuildParameters
         NativeRuntimes = new Dictionary<PlatformFamily, string[]>
         {
             [PlatformFamily.Windows] = new[] { "win-x64", "win-x86" },
-            [PlatformFamily.Linux]   = new[] { "debian.9-x64", "centos.7-x64", "fedora.30-x64", "ubuntu.16.04-x64", "ubuntu.18.04-x64" },
+            [PlatformFamily.Linux]   = new[] { "linux-x64" },
             [PlatformFamily.OSX]     = new[] { "osx-x64" },
         };
 

test-scripts/Test-DotnetGlobalTool.ps1

@@ -4,10 +4,10 @@ param(
     [parameter(Mandatory=$true, Position=2)][string] $repoPath
 )
 
-$result = dotnet tool install GitVersion.Tool --version $version --tool-path /tools --add-source $nugetPath | out-null;
+$result = dotnet tool install GitVersion.Tool --version $version --tool-path $rootPrefix/tools --add-source $nugetPath | out-null;
 
 if($LASTEXITCODE -eq 0) {
-    & "/tools/dotnet-gitversion" $repoPath /showvariable FullSemver;
+    & "$rootPrefix/tools/dotnet-gitversion" $repoPath /showvariable FullSemver;
 } else {
     Write-Output $result
 }