Revert "Revert "Remove testing stuff.""

This reverts commit f8ec39a.
LoopedBard3 · Aug 2, 2023 · f7a2c2c · f7a2c2c
1 parent 2543a9c
commit f7a2c2c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml
@@ -1,9 +1,6 @@
-parameters:
-  TestHybridGlobalization: false
-
 jobs:
 
-- ${{ if or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), parameters.TestHybridGlobalization) }}:
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')) }}:
 
   # build mono iOS scenarios HybridGlobalization
   - template: /eng/pipelines/common/platform-matrix.yml
@@ -159,7 +156,7 @@ jobs:
         iOSStripSymbols: True
         hybridGlobalization: True
 
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'Schedule'), eq(parameters.TestHybridGlobalization, false)) }}:
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'Schedule')) }}:
 
   # 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,7 +8,6 @@ parameters:
   downloadSpecificBuild: null # { buildId, pipeline, branchName, project }
   collectHelixLogsScript: ''
   perfForkToUse: {} # url, branch
-  TestHybridGlobalization: false
 
 jobs:
 
@@ -173,7 +172,7 @@ jobs:
         downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
         perfForkToUse: ${{ parameters.perfForkToUse }}
 
-- ${{if or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), parameters.TestHybridGlobalization) }}:
+- ${{if and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')) }}:
   # 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,11 +20,6 @@ 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.
@@ -50,13 +45,9 @@ extends:
       - template: /eng/pipelines/coreclr/perf-wasm-jobs.yml
         parameters:
           collectHelixLogsScript: ${{ variables._wasmCollectHelixLogsScript }}
-          ${{ or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), parameters.TestHybridGlobalization) }}:
+          ${{ and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')) }}:
             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 }}