Skip to content

Commit bc83487

Browse files
analogrelayHaoKJamesNKdougbu
authored
Merge some straggling master fixes down to preview2 (#19707)
Co-authored-by: Hao Kung <[email protected]> Co-authored-by: James Newton-King <[email protected]> Co-authored-by: Doug Bunting <[email protected]>
1 parent 9ccc593 commit bc83487

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.azure/pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ stages:
683683
# Helix ARM64
684684
- template: jobs/default-build.yml
685685
parameters:
686-
condition: notin(variables['Build.Reason'], 'PullRequest')
686+
condition: and(eq(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))
687687
jobName: Helix_arm64_daily
688688
jobDisplayName: "Tests: Helix ARM64 Daily"
689689
agentOs: Linux

eng/targets/Helix.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />
3838
</ItemGroup>
3939

40-
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true'">
40+
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(RunQuarantinedTests)' != 'true'">
4141
<!-- arm64 queues -->
4242
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
4343

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ await InitializeConnectionAsync(async context =>
225225
await StartStreamAsync(1, _browserRequestHeaders, endStream: true);
226226

227227
await ExpectAsync(Http2FrameType.HEADERS,
228-
withLength: 37,
228+
withLength: 33,
229229
withFlags: (byte)Http2HeadersFrameFlags.END_HEADERS,
230230
withStreamId: 1);
231231
await ExpectAsync(Http2FrameType.DATA,

0 commit comments

Comments
 (0)