Updates to get linux tentacle e2e tests working on linux (#189)

* Setup target frameworks for linux development * Update shared to get watchdog default value (OctopusDeploy/OctopusShared#96) * Decrease logging level to make tests less flaky * Default ApplicationPath properly on linux
OctopusDeploy · Feb 10, 2020 · b4a7eca · b4a7eca
1 parent 57e3d6d
commit b4a7eca
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj b/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
@@ -2,12 +2,18 @@
   <PropertyGroup>
     <RootNamespace>Octopus.Tentacle.Tests</RootNamespace>
     <AssemblyName>Octopus.Tentacle.Tests</AssemblyName>
-    <TargetFrameworks>net452;netcoreapp2.2</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
+  <PropertyGroup Condition="!$([MSBuild]::IsOSUnixLike())">
+    <TargetFrameworks>net452;netcoreapp2.2</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOSUnixLike())">
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <DefineConstants>$(DefineConstants);DEFAULT_PROXY_IS_AVAILABLE</DefineConstants>
   </PropertyGroup>

diff --git a/source/Octopus.Tentacle/Configuration/TentacleConfiguration.cs b/source/Octopus.Tentacle/Configuration/TentacleConfiguration.cs
@@ -11,6 +11,7 @@
 using Octopus.Shared.Configuration;
 using Octopus.Shared.Security;
 using Octopus.Shared.Security.Certificates;
+using Octopus.Shared.Util;
 
 namespace Octopus.Tentacle.Configuration
 {
@@ -82,8 +83,17 @@ public string ApplicationDirectory
                 var path = settings.Get<string>("Tentacle.Deployment.ApplicationDirectory");
                 if (string.IsNullOrWhiteSpace(path))
                 {
-                    var programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
-                    path = Path.Combine(Path.GetPathRoot(programFiles), "Octopus\\Applications");
+                    if (PlatformDetection.IsRunningOnWindows)
+                    {
+                        var programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+                        path = Path.Combine(Path.GetPathRoot(programFiles), "Octopus\\Applications");
+                    }
+                    else
+                    {
+                        //this feels wrong... but it's what we're defaulting to with the install scripts
+                        //see https://github.com/OctopusDeploy/OctopusTentacle/blob/d3a0fca5bb67c49b5f594077ff2b3da8ba377ad3/scripts/configure-tentacle.sh#L47
+                        path = "/home/Octopus/Applications";
+                    }
                 }
 
                 return path;

diff --git a/source/Octopus.Tentacle/Octopus.Tentacle.csproj b/source/Octopus.Tentacle/Octopus.Tentacle.csproj
@@ -3,14 +3,19 @@
     <RootNamespace>Octopus.Tentacle</RootNamespace>
     <AssemblyName>Tentacle</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <TargetFrameworks>net452;netcoreapp2.2</TargetFrameworks>
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputType>Exe</OutputType>
     <NoWin32Manifest>true</NoWin32Manifest>
     <OutputPath>bin\</OutputPath>
     <ApplicationManifest>Tentacle.exe.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="!$([MSBuild]::IsOSUnixLike())">
+    <TargetFrameworks>net452;netcoreapp2.2</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOSUnixLike())">
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+  </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Optimize>True</Optimize>
@@ -23,7 +28,7 @@
     </PackageReference>
     <PackageReference Include="Octopus.Configuration" Version="2.0.1" />
     <PackageReference Include="Octopus.Client" Version="7.1.1" />
-    <PackageReference Include="Octopus.Shared" Version="4.13.12" />
+    <PackageReference Include="Octopus.Shared" Version="5.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/source/Octopus.Tentacle/Tentacle.exe.nlog b/source/Octopus.Tentacle/Tentacle.exe.nlog
@@ -4,7 +4,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   autoReload="true"
   throwExceptions="false"
-  internalLogLevel="Warn"
+  internalLogLevel="Fatal"
   internalLogToConsole="true">
 
   <extensions>