From b1274e228ebb2ebb4df3d9745f6241d7bf17fb27 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Tue, 19 Mar 2024 09:59:38 -0700
Subject: [PATCH] Does this work??

---
 .vsts-ci.yml  | 58 ++++++++++++++++++++++++++-------------------------
 eng/build.yml |  3 ++-
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index dcc5b08f9..d846237a3 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -12,6 +12,8 @@ trigger:
 variables:
 - name: _PublishUsingPipelines
   value: false
+- name: _OneESPT
+  value: true
 - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
   - name: PostBuildSign
     value: false
@@ -106,7 +108,7 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
         # Linux
         - template: eng/build.yml@self
@@ -118,7 +120,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -128,7 +130,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -138,7 +140,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: false
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -149,7 +151,7 @@ extends:
             additionalBuildParameters: '/p:BuildSdkDeb=true'
             linuxPortable: false
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -160,7 +162,7 @@ extends:
             linuxPortable: true
             # Never run tests on arm64
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -173,7 +175,7 @@ extends:
             additionalBuildParameters: '/p:HostOSName="linux-musl"'
             linuxPortable: false
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -182,7 +184,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
         # MacOS
         - template: eng/build.yml@self
@@ -192,7 +194,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x64
             runTests: true
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
       # Official/PGO instrumentation Builds
       - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -205,7 +207,7 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -213,7 +215,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x86
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -221,7 +223,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
         # Linux
         - template: eng/build.yml@self
@@ -233,7 +235,7 @@ extends:
             runtimeIdentifier: 'linux-arm'
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -243,7 +245,7 @@ extends:
             runtimeIdentifier: 'linux-arm64'
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -255,7 +257,7 @@ extends:
             additionalBuildParameters: '/p:OSName="linux-musl"'
             linuxPortable: false
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -266,7 +268,7 @@ extends:
             additionalBuildParameters: '/p:OSName="linux-musl"'
             linuxPortable: false
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -279,7 +281,7 @@ extends:
             additionalBuildParameters: '/p:HostOSName="linux-musl"'
             linuxPortable: false
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -292,7 +294,7 @@ extends:
             additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -305,7 +307,7 @@ extends:
             additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -319,7 +321,7 @@ extends:
             additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true  /p:IsRPMBasedDistro=true'
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -328,7 +330,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
         # MacOS
         - template: eng/build.yml@self
@@ -338,7 +340,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x64
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Darwin
@@ -347,7 +349,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
         # Windows PGO Instrumentation
         - template: eng/build.yml@self
@@ -359,7 +361,7 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -368,7 +370,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: x86
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Windows_NT
@@ -377,7 +379,7 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
         # Linux PGO Instrumentation
         - template: eng/build.yml@self
@@ -389,7 +391,7 @@ extends:
             buildArchitecture: x64
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
         - template: eng/build.yml@self
           parameters:
             agentOs: Linux
@@ -399,7 +401,7 @@ extends:
             buildArchitecture: arm64
             linuxPortable: true
             runTests: false
-            OneESPT: $(OneESPT)
+            OneESPT: true
 
         # Source Build
         - template: /eng/common/templates-official/jobs/source-build.yml@self
diff --git a/eng/build.yml b/eng/build.yml
index ba50e99ea..92c716d91 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -101,7 +101,8 @@ jobs:
 # - template: ${{ parameters.jobTemplatePath }}
 # - ${{ if variables.OneESPT }}:
 # - ${{ if eq(variables['OneESPT'], true) }}:
-- ${{ if eq(parameters.OneESPT, true) }}:
+# - ${{ if eq(parameters.OneESPT, true) }}:
+- ${{ if eq(variables._OneESPT, true) }}:
   - template: common/templates-official/job/job.yml
     parameters:
       # Set up the name of the job.