[release/6.0] Disable Startup and SDK scenarios on Ubuntu (#4440)

* Disable startup scenarios on Ubuntu (backport #4366 to release/6.0) * Disable SDK scenarios on Ubuntu (backport #4403 to release/6.0) * Comment out remaining spots for sdk scenarios
dotnet · Sep 23, 2024 · 91470b0 · 91470b0
1 parent cb199be
commit 91470b0
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 45 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -103,22 +103,22 @@ jobs:
       projectFile: sdk_scenarios.proj
       channels:
         - release/6.0
-  
-  # Ubuntu 2204 x64 SDK scenario benchmarks
-  - template: /eng/performance/scenarios.yml
-    parameters:
-      osName: ubuntu
-      osVersion: 2204
-      kind: sdk_scenarios
-      architecture: x64
-      pool: 
-        vmImage: ubuntu-latest
-      machinePool: Open
-      queue: Ubuntu.2204.Amd64.Open
-      container: ubuntu_x64_build_container
-      projectFile: sdk_scenarios.proj
-      channels:
-        - release/6.0
+
+  # reenable under new machine on new ubuntu once lttng/events are available
+  # - template: /eng/performance/scenarios.yml
+  #   parameters:
+  #     osName: ubuntu
+  #     osVersion: 2204
+  #     kind: sdk_scenarios
+  #     architecture: x64
+  #     pool: 
+  #       vmImage: ubuntu-latest
+  #     machinePool: Open
+  #     queue: Ubuntu.2204.Amd64.Open
+  #     container: ubuntu_x64_build_container
+  #     projectFile: sdk_scenarios.proj
+  #     channels:
+  #       - release/6.0
 
   # Windows x86 SDK scenario benchmarks
   - template: /eng/performance/scenarios.yml
@@ -538,21 +538,22 @@ jobs:
       channels:
         - release/6.0
 
+  # reenable under new machine on new ubuntu once lttng/events are available
   # Ubuntu 2204 x64 SDK scenario benchmarks
-  - template: /eng/performance/scenarios.yml
-    parameters:
-      osName: ubuntu
-      osVersion: 2204
-      architecture: x64
-      pool: 
-        vmImage: ubuntu-latest
-      kind: sdk_scenarios
-      machinePool: Tiger
-      queue: Ubuntu.2204.Amd64.Tiger.Perf
-      container: ubuntu_x64_build_container
-      projectFile: sdk_scenarios.proj
-      channels:
-        - release/6.0
+  # - template: /eng/performance/scenarios.yml
+  #   parameters:
+  #     osName: ubuntu
+  #     osVersion: 2204
+  #     architecture: x64
+  #     pool: 
+  #       vmImage: ubuntu-latest
+  #     kind: sdk_scenarios
+  #     machinePool: Tiger
+  #     queue: Ubuntu.2204.Amd64.Tiger.Perf
+  #     container: ubuntu_x64_build_container
+  #     projectFile: sdk_scenarios.proj
+  #     channels:
+  #       - release/6.0
 
   # Windows x64 Blazor 3.2 scenario benchmarks
   - template: /eng/performance/scenarios.yml
@@ -606,18 +607,19 @@ jobs:
       channels:
         - $(channel) # for manual runs we can specify channel variable 
 
+  # reenable under new machine on new ubuntu once lttng/events are available
   # Ubuntu 2204 x64 SDK scenario benchmarks
-  - template: /eng/performance/scenarios.yml
-    parameters:
-      osName: ubuntu
-      osVersion: 2204
-      architecture: x64
-      pool:
-        vmImage: ubuntu-latest
-      kind: sdk_scenarios
-      machinePool: Tiger
-      queue: Ubuntu.2204.Amd64.Tiger.Perf
-      container: ubuntu_x64_build_container
-      projectFile: sdk_scenarios.proj
-      channels:
-        - $(channel)
+  # - template: /eng/performance/scenarios.yml
+  #   parameters:
+  #     osName: ubuntu
+  #     osVersion: 2204
+  #     architecture: x64
+  #     pool:
+  #       vmImage: ubuntu-latest
+  #     kind: sdk_scenarios
+  #     machinePool: Tiger
+  #     queue: Ubuntu.2204.Amd64.Tiger.Perf
+  #     container: ubuntu_x64_build_container
+  #     projectFile: sdk_scenarios.proj
+  #     channels:
+  #       - $(channel)
diff --git a/eng/performance/scenarios.proj b/eng/performance/scenarios.proj
@@ -86,9 +86,10 @@
     </PreparePayloadWorkItem>
   </ItemGroup>
 
+  <!-- Startup scenarios are temporarily disabled on non-Windows runs as lttng kernel modules are failing to install: https://github.com/dotnet/performance/issues/4149 -->
 
   <!-- Startup FDD publish -->
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <HelixWorkItem Include="@(Scenario -> 'Startup - %(Identity) - FDD Publish')">
       <PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_fdd %HELIX_WORKITEM_ROOT%\pub /E /I /Y</PreCommands>
       <PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_fdd $HELIX_WORKITEM_ROOT/pub</PreCommands>