Trying oneEsPt as object name for template parameter object. Trying S…

…ystem.JobName.
dotnet · ViktorHofer · May 22, 2024 · May 3, 2024 · May 3, 2024 · May 3, 2024
commit 0cc1f46282d1cd9369c804ef97069f121695b532
@@ -99,9 +99,9 @@ extends:
             image: 1es-windows-2022
             os: windows
           helixTargetQueue: Windows.Amd64.VS2022.Pre
-          jobTemplatePath: /eng/common/templates-official/job/job.yml
-          publishTaskName: '1ES.PublishBuildArtifacts@1'
-          phaseName: $(System.PhaseName)
+          oneEsPt:
+            jobTemplatePath: /eng/common/templates-official/job/job.yml
+            publishTaskName: 1ES.PublishBuildArtifacts@1
           variables:
             runTests: ${{ parameters.runTests }}
           # containers:
@@ -133,7 +133,7 @@ extends:
                   testFullMSBuild: true
                 TestAsTools:
                   testInBuildProperties: /p:RunTestsAsTool=true
-                  # This uses the build step for testing, so the explicit test step is not necessary.
+                  # This uses the build step for testing, so the extra test step is not necessary.
                   runTests: false
                 TemplateEngine:
                   testName: TemplateEngineTests

@@ -1,6 +1,7 @@
 parameters:
-  jobTemplatePath: /eng/common/templates/job/job.yml
-  publishTaskName: 'PublishBuildArtifacts@1'
+  oneEsPt:
+    jobTemplatePath: /eng/common/templates/job/job.yml
+    publishTaskName: PublishBuildArtifacts@1
   # buildCategory: Build
   buildArchitecture: x64
   # # Agent OS identifier and used as job name
@@ -13,10 +14,10 @@ parameters:
   # strategy: ''
 
 jobs:
-- template: ${{ parameters.jobTemplatePath }}
+- template: ${{ parameters.oneEsPt.jobTemplatePath }}
   parameters:
-    name: ${{ parameters.phaseName }}_${{ parameters.pool.os }}_${{ parameters.buildArchitecture }}
-    displayName: ${{ parameters.phaseName }} ${{ parameters.pool.os }} ${{ parameters.buildArchitecture }}
+    name: ${{ variables['System.JobName'] }}_${{ parameters.pool.os }}_${{ parameters.buildArchitecture }}
+    displayName: ${{ variables['System.JobName'] }} ${{ parameters.pool.os }} ${{ parameters.buildArchitecture }}
     pool: ${{ parameters.pool }}
     strategy: ${{ parameters.strategy }}
     helixRepo: dotnet/sdk
@@ -118,11 +119,11 @@ jobs:
       continueOnError: true
       condition: always()
 
-    - task: ${{ parameters.publishTaskName }}
+    - task: ${{ parameters.oneEsPt.publishTaskName }}
       displayName: Publish Logs
       inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-        ArtifactName: '${{ parameters.pool.os }}_$(Agent.JobName)_$(Build.BuildNumber)'
+        PathtoPublish: $(Build.ArtifactStagingDirectory)
+        ArtifactName: ${{ parameters.pool.os }}_$(Agent.JobName)_$(Build.BuildNumber)
         publishLocation: Container
       continueOnError: true
       condition: always()