Skip to content

Move mobile iOS Maui scenarios to perf repo #2942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LoopedBard3 merged 15 commits into from
Apr 4, 2023
Merged

Move mobile iOS Maui scenarios to perf repo #2942

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e9f866f
First pass at adding the scenario files for iOS Maui in Perf Repo.
LoopedBard3 Mar 14, 2023
50977a4
Added iOS Maui Scenario and build machine definition.
LoopedBard3 Mar 14, 2023
acdab0c
First pass at maui_scenarios_ios.proj file. Does not include device s…
LoopedBard3 Mar 14, 2023
0ee0a61
Setup testing.
LoopedBard3 Mar 14, 2023
bf99012
Fix Pipeline first run.
LoopedBard3 Mar 14, 2023
1494dce
Add device startup to testing.
LoopedBard3 Mar 16, 2023
6038732
Better testing of directory locations and zipping stuff.
LoopedBard3 Mar 22, 2023
dcca474
Reenable other ios tests and add blazor ios tests.
LoopedBard3 Mar 23, 2023
73d03b8
Try passing and using the Version setup.
LoopedBard3 Mar 27, 2023
25bc1ea
Revert "Try passing and using the Version setup."
LoopedBard3 Mar 28, 2023
c524269
Check if powershell commands work at all on the MAC machines.
LoopedBard3 Mar 28, 2023
a727895
Verified that running powershell is possible, just needed to set shel…
LoopedBard3 Mar 29, 2023
f72e711
New method seems to work, trying full E2E with versions working.
LoopedBard3 Mar 29, 2023
3cc27b0
Fix reading of versions files by updating their paths and making sure…
LoopedBard3 Mar 29, 2023
5bd848e
Revert "Setup testing."
LoopedBard3 Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reenable other ios tests and add blazor ios tests.
  • Loading branch information
@LoopedBard3
LoopedBard3 committed Mar 23, 2023
commit dcca4742a152f0cd8f47b8143ce632f3f685e865
44 changes: 19 additions & 25 deletions eng/performance/maui_scenarios_ios.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,30 @@
<IPAName>MauiiOSPodcast</IPAName>
<PackageName>net.dot.net.dot.netconf2021.maui</PackageName>
</MAUIiOSScenario> -->
<!-- <MAUIiOSScenario Include="Maui Blazor iOS Default">
<MAUIiOSScenario Include="Maui Blazor iOS Default">
<ScenarioDirectoryName>mauiblazorios</ScenarioDirectoryName>
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
<IPAName>MauiBlazoriOSDefault</IPAName>
<PackageName>net.dot.mauiblazortesting</PackageName>
</MAUIiOSScenario> -->
</MAUIiOSScenario>
</ItemGroup>

<ItemGroup>
<PreparePayloadWorkItem Include="@(MAUIiOSScenario)">
<!-- <Command>pwd; cd ../; pwd; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName); ls</Command> -->
<Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c Release -r ios-arm64 -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName); cd ../; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
</PreparePayloadWorkItem>
</ItemGroup>

<ItemGroup>
<!-- <HelixWorkItem Include="@(MAUIiOSScenario -> 'SOD - %(Identity) IPA Size')">
<HelixWorkItem Include="@(MAUIiOSScenario -> 'SOD - %(Identity) IPA Size')">
<PreCommands>cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName) $HELIX_WORKITEM_ROOT/pub</PreCommands>
<Command>$(Python) test.py sod -1-scenario-name &quot;%(Identity)&quot;</Command>
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
</HelixWorkItem>
<HelixWorkItem Include="@(MAUIiOSScenario -> 'SOD - %(Identity) Unzipped')">
<PreCommands>cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName) $HELIX_WORKITEM_ROOT/pub; mv $HELIX_WORKITEM_ROOT/pub/%(HelixWorkItem.IPAName).ipa $HELIX_WORKITEM_ROOT/pub/%(HelixWorkItem.IPAName).zip; unzip -d $HELIX_WORKITEM_ROOT/pub $HELIX_WORKITEM_ROOT/pub/%(HelixWorkItem.IPAName).zip; rm $HELIX_WORKITEM_ROOT/pub/%(HelixWorkItem.IPAName).zip</PreCommands>
<Command>$(Python) test.py sod -1-scenario-name &quot;%(Identity)&quot;</Command>
</HelixWorkItem> -->
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
</HelixWorkItem>
<XHarnessAppBundleToTest Include="Device Startup - iOS Maui Default">
<AppBundlePath>$(ScenariosDir)mauiios.zip</AppBundlePath>
<WorkItemTimeout>00:15:00</WorkItemTimeout>
Expand All @@ -71,15 +70,8 @@
# PreCommands
export XHARNESSPATH=$XHARNESS_CLI_PATH

# Get the .app so we can resign in the xharness item for Maui Blazor
pwd
ls -R $HELIX_WORKITEM_ROOT
echo "SPLIT LS HERE"
ls $HELIX_CORRELATION_PAYLOAD
echo "LS DONE HERE"
cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauiios/MauiiOSDefault.ipa $HELIX_WORKITEM_ROOT/mauiios/MauiiOSDefault.zip
unzip -d $HELIX_WORKITEM_ROOT/mauiios $HELIX_WORKITEM_ROOT/mauiios/MauiiOSDefault.zip
ls -R $HELIX_WORKITEM_ROOT/mauiios
mv $HELIX_WORKITEM_ROOT/mauiios/Payload/MauiiOSDefault.app $HELIX_WORKITEM_ROOT/mauiios/MauiiOSDefault.app
cp -f embedded.mobileprovision $HELIX_WORKITEM_ROOT/mauiios/MauiiOSDefault.app
cd $HELIX_WORKITEM_ROOT/mauiios
Expand All @@ -97,32 +89,34 @@
]]>
</CustomCommands>
</XHarnessAppBundleToTest>
<!-- <XHarnessAppBundleToTest Include="Device Startup - iOS Maui Blazor Default" Condition="'$(iOSLlvmBuild)' == 'False'">
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
<XHarnessAppBundleToTest Include="Device Startup - iOS Maui Blazor Default">
<AppBundlePath>$(ScenariosDir)mauiblazorios.zip</AppBundlePath>
<WorkItemTimeout>00:15:00</WorkItemTimeout>
<TestTarget>ios-device</TestTarget>
<CustomCommands>
<![CDATA[
# PreCommands
export XHARNESSPATH=$XHARNESS_CLI_PATH

cp -r $HELIX_CORRELATION_PAYLOAD/MauiBlazorTesting.app $(ScenarioDirectory)mauiblazorios/MauiBlazorTesting.app
cp -f embedded.mobileprovision $(ScenarioDirectory)mauiblazorios/MauiBlazorTesting.app
cd $(ScenarioDirectory)mauiblazorios
sign MauiBlazorTesting.app
cp -v $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/mauiblazorios/MauiBlazoriOSDefault.ipa $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.zip
unzip -d $HELIX_WORKITEM_ROOT/mauiblazorios $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.zip
mv $HELIX_WORKITEM_ROOT/mauiblazorios/Payload/MauiBlazoriOSDefault.app $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.app
cp -f embedded.mobileprovision $HELIX_WORKITEM_ROOT/mauiblazorios/MauiBlazoriOSDefault.app
cd $HELIX_WORKITEM_ROOT/mauiblazorios
sign MauiBlazoriOSDefault.app

$(Python) pre.py -1-name MauiBlazorTesting.app
$(Python) pre.py --name MauiBlazoriOSDefault.app

# Testing commands
$(Python) test.py devicestartup -1-device-type ios -1-package-path MauiBlazorTesting.app -1-package-name net.dot.mauiblazortesting -1-scenario-name "%(Identity)" -1-use-fully-drawn-time -1-fully-drawn-magic-string __MAUI_Blazor_WebView_OnAfterRender__ -1-startup-iterations 5
$(Python) test.py devicestartup --device-type ios --package-path MauiBlazoriOSDefault.app --package-name net.dot.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-magic-string __MAUI_Blazor_WebView_OnAfterRender__ --startup-iterations 5
((result=$?))

# Post commands
$(Python) post.py
exit $result
]]>
</CustomCommands>
</XHarnessAppBundleToTest> -->
</XHarnessAppBundleToTest>
<!-- <XHarnessAppBundleToTest Include="Device Startup - iOS Maui Podcast" Condition="'$(iOSLlvmBuild)' == 'False'">
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
<WorkItemTimeout>00:15:00</WorkItemTimeout>
Expand Down Expand Up @@ -157,11 +151,11 @@
being run before we get to run our normal Post commands. AddXHarnessCLI is the XHarness
Target so we just make sure we add this after that.
-->
<!-- <Target Name="ResetPYTHONPATHBeforeXHarnessCommand" AfterTargets="AddXHarnessCLI">
<Target Name="ResetPYTHONPATHBeforeXHarnessCommand" AfterTargets="AddXHarnessCLI">
<PropertyGroup>
<HelixPostCommands>export PYTHONPATH=$ORIGPYPATH;$(HelixPostCommands)</HelixPostCommands>
</PropertyGroup>
</Target> -->
</Target>

<Import Project="PreparePayloadWorkItems.targets" />
</Project>