Fix PDN pre-command (#2724)

Author: cincuranet

eng/performance/scenarios.proj

@@ -50,13 +50,15 @@
     <UIScenario Include="PaintDotNet" Condition="'$(TargetsWindows)' == 'true' And $(BUILD_REPOSITORY_PROVIDER) == 'TfsGit'">
       <ScenarioDirectoryName>paintdotnet</ScenarioDirectoryName>
       <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
+      <ExplicitPrepareCommand>$(Python) pre.py extract -p $(CorrelationPayloadDirectory)PDN\PDN.zip -o $(PreparePayloadWorkItemBaseDirectory)%(ScenarioDirectoryName)_fdd</ExplicitPrepareCommand>
     </UIScenario>
   </ItemGroup>
 
 
   <ItemGroup>
     <PreparePayloadWorkItem Include="@(UIScenario)">
-      <Command>$(Python) pre.py publish -f $(PERFLAB_Framework) -c Release --windowsui -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)_fdd</Command>
+      <Command Condition="'%(PreparePayloadWorkItem.ExplicitPrepareCommand)' != ''">%(PreparePayloadWorkItem.ExplicitPrepareCommand)</Command>
+      <Command Condition="'%(PreparePayloadWorkItem.ExplicitPrepareCommand)' == ''">$(Python) pre.py publish -f $(PERFLAB_Framework) -c Release --windowsui -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)_fdd</Command>
       <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
     </PreparePayloadWorkItem>
     <PreparePayloadWorkItem Include="@(Scenario)">

eng/performance/scenarios.yml

@@ -102,6 +102,12 @@ jobs:
             displayName: Build SOD tool
             env:
               PERFLAB_TARGET_FRAMEWORKS: $(PERFLAB_Framework)
+          # Current version of PaintDotNet zip file is PDN7 built on 5/18/2022
+          - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+            - powershell: |
+                mkdir $(CorrelationStaging)PDN
+                curl "https://pvscmdupload.blob.core.windows.net/assets/PDN.zip$(PerfCommandUploadTokenNonEscaped)" -OutFile $(CorrelationStaging)PDN\PDN.zip
+              displayName: Download PDN
           - powershell: |
               $(Python) -m pip install --upgrade pip
               $(Python) -m pip install requests
@@ -114,12 +120,6 @@ jobs:
               TargetsWindows: 'true'
               WorkItemDirectory: $(Build.SourcesDirectory)
               HelixTargetQueues: ${{ parameters.queue }}
-          # Current version of PaintDotNet zip file is PDN7 built on 5/18/2022
-          - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-            - powershell: |
-                mkdir $(CorrelationStaging)PDN
-                curl "https://pvscmdupload.blob.core.windows.net/assets/PDN.zip$(PerfCommandUploadTokenNonEscaped)" -OutFile $(CorrelationStaging)PDN\PDN.zip
-              displayName: Download PDN
           - ${{ if eq(parameters.architecture, 'arm64') }}:
             - script: taskkill /im dotnet.exe /f
               displayName: Stop dotnet.exe

src/scenarios/paintdotnet/pre.py

@@ -5,21 +5,21 @@
 import os, subprocess
 import zipfile
 from performance.logger import setup_loggers
-from os.path import join
+from os.path import join, normpath
 from shared.util import helixcorrelationpayload
 from performance.common import runninginlab
 from shared.precommands import PreCommands
 from shared import const
 from logging import getLogger
-from shutil import copytree
+from shutil import copytree, rmtree
 
 setup_loggers(True)
 
 precommands = PreCommands()
 
-if runninginlab():   
-    with zipfile.ZipFile(join(helixcorrelationpayload(), "PDN\PDN.zip"), 'r') as publish:
-        publish.extractall(const.PUBDIR)
-elif precommands.pathtozip:
-    with zipfile.ZipFile(precommands.pathtozip, 'r') as publish:
-        publish.extractall(const.PUBDIR)
+output = precommands.output or const.PUBDIR
+with zipfile.ZipFile(precommands.pathtozip, 'r') as publish:
+    publish.extractall(output)
+copytree(join(output, 'PDN8', 'Release'), output, dirs_exist_ok=True)
+rmtree(join(output, 'PDN8'))
+getLogger().info(f"Unpacked {precommands.pathtozip} into {output}.")