Skip to content

[automated] Merge branch 'release/2.1' => 'release/2.2' #7920

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.

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

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/2.1
git pull --ff-only
git checkout release/2.2
git pull --ff-only
git merge --no-ff release/2.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
or if you are using SSH
git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

- aspnet/AspNetCore-Internal#1717
- use a specific Linux image
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/2.1 by the following committers:

@dougbu
Copy link
Contributor

dougbu commented Feb 26, 2019

@mikaelm12 note your ConsoleReporter and RetryHelper additions are part of this merge

…eration.Design in templates (dotnet#7983)

- see aspnet/AspNetCore-Internal#1759
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

3 similar comments
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dougbu dougbu force-pushed the merge/release/2.1-to-release/2.2 branch from 15470f0 to 40a6a0e Compare March 4, 2019 06:23
@dougbu
Copy link
Contributor

dougbu commented Mar 4, 2019

This merge branch is /intentionally/ incomplete. Trying to get the queues updated in release/2.2 first.

@dougbu dougbu force-pushed the merge/release/2.1-to-release/2.2 branch 2 times, most recently from ab8cd3d to 5868492 Compare March 4, 2019 22:39
@dougbu
Copy link
Contributor

dougbu commented Mar 6, 2019

@aspnet/brt are the following failures in Windows and macOS AspNetCore-ci builds known flaky tests?

@javiercn is the failure to start Chrome on Linux related to what you're working on for master in #8188?

In Linux test group Cors.FunctionalTests/netcoreapp2.2:

[xUnit.net 00:00:25.38]     FunctionalTests.CorsMiddlewareFunctionalTests.RunClientTests [FAIL]
  Failed   FunctionalTests.CorsMiddlewareFunctionalTests.RunClientTests
  Error Message:
   FunctionalTests.Assert+ProcessAssertException : npm test --no-watchman exited with 1.
  
  
  > @ test /datadisks/disk1/vsagent/work/6/s/src/Middleware/CORS/test/FunctionalTests
  > jest
  
    console.log test.js:21
      Begin launching puppeteer
  
  FAIL ./test.js
    Browser is initialized
      ✕ no errors on launch (28ms)
    CORS allowed origin tests 
      ✕ allows simple GET requests
      ✕ allows simple PUT requests when any method is allowed
      ✕ allows POST requests when not explicitly allowed
      ✕ allows header to be sent when allowed (1ms)
      ✕ does not allow disallowed HTTP Methods
      ✕ does not allow disallowed header (1ms)
      ✕ does not allow fetch with credentials in non-Preflighted request
      ✕ does not allow fetch with credentials in Preflighted request (1ms)
      ✕ allows request with credentials
      ✕ allows Preflighted request with credentials
      ✕ disallows accessing header when not included in exposed-header (1ms)
      ✕ allows accessing header when included in exposed-header
    CORS disallowed origin tests 
      ✕ allow opaque requests without CORS (1ms)
      ✕ does not allow requests when origin is disallowed
      ✕ does not allow preflight requests when origin is disallowed
      ✕ allow requests to any origin endpoint
      ✕ does not allow requests to any origin endpoint with credentials
  
    ● Browser is initialized › no errors on launch
  
      expect(received).toBeUndefined()
  
      Received: [Error: Failed to launch chrome!
      /datadisks/disk1/vsagent/work/6/s/src/Middleware/CORS/test/FunctionalTests/node_modules/puppeteer/.local-chromium/linux-637110/chrome-linux/chrome: error while loading shared libraries: libX11-xcb.so.1: cannot open shared object file: No such file or directory
  
  
      TROUBLESHOOTING: https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md
      ]
  
        42 |     // and if unsuccessful report the error
        43 |     test('no errors on launch', () => {
      > 44 |         expect(error).toBeUndefined();
           |                       ^
        45 |         expect(browser).toBeDefined();
        46 |     });
        47 | });
  
        at Object.toBeUndefined (test.js:44:23)
...

In Windows test group UnitTests/netcoreapp2.2:

[xUnit.net 00:16:55.99]     Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.CompressionTests+OutOfProcessV1.PassesThroughCompression [FAIL]
  Failed   Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.CompressionTests+OutOfProcessV1.PassesThroughCompression
  Error Message:
   System.InvalidOperationException : Sequence contains no elements
  Stack Trace:
     at System.Linq.Enumerable.Single[TSource](IEnumerable`1 source)
     at Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.CompressionTests.PassesThroughCompression()
  --- End of stack trace from previous location where exception was thrown ---
  Standard Output Messages:
   | [0.005s] TestLifetime Information: Starting test PassesThroughCompression at 2019-03-06T06:55:00
   | [7.669s] TestLifetime Information: Finished test PassesThroughCompression in 7.6639403s
  
  
  Results File: F:\vsagent\27\s\artifacts\logs\UnitTests-netcoreapp2.2-20190304.40.trx
  
  Total tests: 24055. Passed: 24010. Failed: 1. Skipped: 44.

@javiercn
Copy link
Member

javiercn commented Mar 6, 2019

@dougbu kindoff but not. @pranavkm

@analogrelay
Copy link
Contributor

@aspnet/brt are the following failures in Windows and macOS AspNetCore-ci builds known flaky tests?

Not to my knowledge. I was also mostly ignoring these PRs since you said to do so earlier :). If you think they need to be filed as flaky tests, I can do that.

@dougbu
Copy link
Contributor

dougbu commented Mar 6, 2019

If you think they need to be filed as flaky tests, I can do that.

Looks like the Linux problem is real and likely related to switching machine pools i.e. the details of this PR.

However the Windows test failed in one of three attempts. That seems flaky to me 😈

@analogrelay
Copy link
Contributor

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

1 similar comment
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@pranavkm
Copy link
Contributor

pranavkm commented Mar 8, 2019

The CORS error looks like it does not have some pre-requisites for chromium installed. See puppeteer/puppeteer#290 (comment). puppeteer/puppeteer#290 (comment) has the instructions on what needs to be installed to get this resolved. I think you'd need these for Templating tests too since that uses Selenium + Chrome.

@dougbu
Copy link
Contributor

dougbu commented Mar 8, 2019

@pranavkm agreed. I wasn't prioritizing this merge but add the needful Chrome install next week.

@dougbu
Copy link
Contributor

dougbu commented Mar 8, 2019

If this is a high priority e.g. because some test changes are needed immediately in release/2.2 or we take a 2.1.10 change, please send me a bang ‼️ mail.

@dougbu dougbu force-pushed the merge/release/2.1-to-release/2.2 branch from e6fbc5a to 53732a6 Compare March 13, 2019 21:52
- remove updates about baseline test (5661c41 and d2a4435)
  - already done (differently) in release/2.2
- add JDK installation -- missing in these images but not needed in `release/2.1`
- add packages needed to run Chrome
@dougbu dougbu force-pushed the merge/release/2.1-to-release/2.2 branch from 53732a6 to 0c6591b Compare March 14, 2019 02:17
@dougbu dougbu merged commit d76c547 into dotnet:release/2.2 Mar 14, 2019
@dougbu dougbu mentioned this pull request Mar 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants