Skip to content
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

Re-enable kVideoPlaybackQuality to fix webcompat issue (uplift to 1.19.x) #7451

Merged
merged 1 commit into from
Dec 27, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Dec 16, 2020

Uplift of #7437
Fixes brave/brave-browser#13183

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@bsclifton bsclifton added this to the 1.19.x - Beta milestone Dec 16, 2020
@bsclifton bsclifton requested a review from a team December 16, 2020 05:58
@bsclifton bsclifton self-assigned this Dec 16, 2020
@bsclifton bsclifton changed the title Re-enable kVideoPlaybackQuality to fix webcompat issue Re-enable kVideoPlaybackQuality to fix webcompat issue (uplift to 1.19.x) Dec 16, 2020
@bsclifton bsclifton force-pushed the bsc-revert-kVideoPlaybackQuality-1.19.x branch from 806d88e to 38ba984 Compare December 16, 2020 23:21
@kjozwiak
Copy link
Member

kjozwiak commented Dec 27, 2020

Restarting macOS, Linux, iOS and Android due to Perform an HTTP Request and return a response object failing as per:

hudson.AbortException: Fail: the returned code 503 is not in the accepted range: [[100‥399]]
	at jenkins.plugins.http_request.HttpRequestExecution.responseCodeIsValid(HttpRequestExecution.java:369)
	at jenkins.plugins.http_request.HttpRequestExecution.processResponse(HttpRequestExecution.java:379)
	at jenkins.plugins.http_request.HttpRequestExecution.authAndRequest(HttpRequestExecution.java:295)
	at jenkins.plugins.http_request.HttpRequestExecution.call(HttpRequestExecution.java:226)

@kjozwiak
Copy link
Member

test-browser failed on macOS due to several rewards tests failing as per https://ci.brave.com/job/pr-brave-browser-bsc-revert-kVideoPlaybackQuality-1.19.x-macos/3/execution/node/202/log. These are known intermittent failures as per brave/brave-browser#12704 and brave/brave-browser#12605.

09:43:52  2 tests failed:
09:43:52      RewardsBrowserTest.UpholdLimitNoBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:398)
09:43:52      RewardsPromotionBrowserTest.ClaimViaPanel (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:202)

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.19.x approved after deliberating with @brave/uplift-approvers. @ryanbr verified that it's working as per #7437 (comment).

@kjozwiak kjozwiak merged commit 9b11f13 into 1.19.x Dec 27, 2020
@kjozwiak kjozwiak deleted the bsc-revert-kVideoPlaybackQuality-1.19.x branch December 27, 2020 20:16
mkarolin added a commit that referenced this pull request Jan 20, 2021
This fixes an incorrect merge introduced by #7518 that
reverted the fix initially implemented by #7451.

Fixes brave/brave-browser#13679
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.

2 participants