Re-enable SqlServer on helix

Resolves #23776
dotnet · Feb 10, 2021 · d084e05 · d084e05
1 parent acfee51
commit d084e05
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/eng/helix.proj b/eng/helix.proj
@@ -44,11 +44,8 @@
   <ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-18.04-helix-sqlserver-amd64`))'">
     <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
     <XUnitProject Include="$(SqlServerTests);$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj">
-      <PreCommands>$(PreCommands); export MSSQL_SA_PASSWORD=$(MSSQL_SA_PASSWORD); /opt/mssql/bin/sqlservr --accept-eula &amp;; export Test__SqlServer__DefaultConnection="Data Source=localhost;;Database=master;;User=sa;;Password=$(MSSQL_SA_PASSWORD);;Connect Timeout=60;;ConnectRetryCount=0"; sleep 120</PreCommands>
-      <XUnitWorkItemTimeout>01:00:00</XUnitWorkItemTimeout>
+      <PreCommands>$(PreCommands); export MSSQL_SA_PASSWORD=$(MSSQL_SA_PASSWORD); /opt/mssql/bin/sqlservr --accept-eula &amp;; export Test__SqlServer__DefaultConnection="Data Source=localhost;;Database=master;;User=sa;;Password=$(MSSQL_SA_PASSWORD);;Connect Timeout=60;;ConnectRetryCount=0" > /dev/null; sleep 120</PreCommands>
     </XUnitProject>
-    <!-- Remove SqlServer Functional Tests till #23776 is resolved -->
-    <XUnitProject Remove="$(RepoRoot)/test/EFCore.SqlServer.FunctionalTests/*.csproj"/>
   </ItemGroup>
 
   <!-- Remove test projects which requires SqlServer from Ubuntu/OSX. -->
@@ -61,6 +58,6 @@
     <XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
     <XUnitRunnerVersion>2.4.1</XUnitRunnerVersion>
     <XUnitArguments></XUnitArguments>
-    <XUnitWorkItemTimeout Condition = "'$(XUnitWorkItemTimeout)' == ''">00:30:00</XUnitWorkItemTimeout>
+    <XUnitWorkItemTimeout Condition = "'$(XUnitWorkItemTimeout)' == ''">01:00:00</XUnitWorkItemTimeout>
   </PropertyGroup>
 </Project>