Skip to content

Commit da09bb7

Browse files
authored
Skip all non-template tests in internal Windows test job (#65211)
* Update to Ubuntu 24 * Skip NewShim Functional Tests in internal builds * Fixup * Whoops * Fixeroonie * Update Helix.Common.props * Update Ubuntu version in Helix.targets
1 parent a206981 commit da09bb7

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.azure/pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ extends:
533533
cancelTimeoutInMinutes: 30
534534
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
535535
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
536-
$(_InternalRuntimeDownloadArgs)
536+
/p:OnlyTestProjectTemplates=true $(_InternalRuntimeDownloadArgs)
537537
beforeBuild:
538538
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
539539
displayName: Setup IISExpress test certificates and schema

.azure/pipelines/jobs/default-build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,6 @@ jobs:
410410
displayName: Install Node 20.x
411411
inputs:
412412
versionSpec: 20.x
413-
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
414-
- powershell: |
415-
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
416-
./eng/scripts/InstallGoogleChrome.ps1
417-
displayName: Install Chrome
418413
- ${{ if eq(parameters.agentOs, 'Windows') }}:
419414
- powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
420415
displayName: Add dotnet tools to path
@@ -536,4 +531,4 @@ jobs:
536531
testRunTitle: $(AgentOsName)-$(BuildConfiguration)-js
537532
mergeTestResults: true
538533
buildConfiguration: $(BuildConfiguration)
539-
buildPlatform: $(AgentOsName)
534+
buildPlatform: $(AgentOsName)

src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<TestGroupName>IISNewShim.FunctionalTests</TestGroupName>
66
<DefineConstants>NEWSHIM_FUNCTIONALS</DefineConstants>
77
<SkipTests Condition=" '$(SkipIISNewShimTests)' == 'true' ">true</SkipTests>
8+
<!-- Skip these in all internal builds to avoid restoring vulnerable packages for CG -->
9+
<SkipTests Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' ">true</SkipTests>
10+
<ExcludeFromBuild Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' ">true</ExcludeFromBuild>
811
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
912
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1013
</PropertyGroup>

src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
99
<ImplicitUsings>disable</ImplicitUsings>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11+
<!-- Skip these in all internal builds to avoid restoring vulnerable packages for CG -->
12+
<ExcludeFromBuild Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' ">true</ExcludeFromBuild>
1113
</PropertyGroup>
1214

1315
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">

0 commit comments

Comments
 (0)