Revert "Revert "Revert "Remove testing stuff."""

This reverts commit f7a2c2c.
LoopedBard3 · Aug 17, 2023 · 8e9b5ab · 8e9b5ab
1 parent c07a9d7
commit 8e9b5ab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml
@@ -1,6 +1,9 @@
+parameters:
+  TestHybridGlobalization: false
+
 jobs:
 
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')) }}:
+- ${{ if or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), parameters.TestHybridGlobalization) }}:
 
   # build mono iOS scenarios HybridGlobalization
   - template: /eng/pipelines/common/platform-matrix.yml
@@ -156,7 +159,7 @@ jobs:
         iOSStripSymbols: True
         hybridGlobalization: True
 
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'Schedule')) }}:
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'Schedule'), eq(parameters.TestHybridGlobalization, false)) }}:
 
   # build coreclr and libraries
   - template: /eng/pipelines/common/platform-matrix.yml

diff --git a/eng/pipelines/coreclr/perf-wasm-jobs.yml b/eng/pipelines/coreclr/perf-wasm-jobs.yml
@@ -8,6 +8,7 @@ parameters:
   downloadSpecificBuild: null # { buildId, pipeline, branchName, project }
   collectHelixLogsScript: ''
   perfForkToUse: {} # url, branch
+  TestHybridGlobalization: false
 
 jobs:
 
@@ -172,7 +173,7 @@ jobs:
         downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
         perfForkToUse: ${{ parameters.perfForkToUse }}
 
-- ${{if and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')) }}:
+- ${{if or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), parameters.TestHybridGlobalization) }}:
   # run mono wasm blazor perf job
   - template: /eng/pipelines/common/platform-matrix.yml
     parameters:

diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml
@@ -20,6 +20,11 @@ trigger:
 variables:
   - template: /eng/pipelines/common/variables.yml
 
+parameters:
+- name: TestHybridGlobalization
+  type: boolean
+  default: true
+
 #
 # For the 'schedule' case, only wasm/jsc perf jobs are run.
 # And the rest are build jobs - wasm, mono, coreclr, and libraries.
@@ -45,9 +50,13 @@ extends:
       - template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
         parameters:
           collectHelixLogsScript: ${{ variables._wasmCollectHelixLogsScript }}
-          ${{ and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')) }}:
+          ${{ or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), parameters.TestHybridGlobalization) }}:
             runProfile: 'non-v8'
+            TestHybridGlobalization: ${{ parameters.TestHybridGlobalization }}
           ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'Schedule')) }}:
             runProfile: 'v8'
+            TestHybridGlobalization: ${{ parameters.TestHybridGlobalization }}
 
       - template: /eng/pipelines/coreclr/perf-non-wasm-jobs.yml
+        parameters:
+          TestHybridGlobalization: ${{ parameters.TestHybridGlobalization }}