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

Force to refresh sync cycle(poll/nudge) when transiting from CONFIGURATION to NORMAL mode. (uplift to 1.13.x) #6366

Merged
merged 1 commit into from
Aug 10, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 6, 2020

Uplift of #6363
Resolves brave/brave-browser#11116

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.

@brave-builds brave-builds requested a review from a team August 6, 2020 22:44
@brave-builds brave-builds self-assigned this Aug 6, 2020
@brave-builds brave-builds added this to the 1.13.x - Beta milestone Aug 6, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Aug 7, 2020

test-unit failed on Win x64 due to GreaselionServiceTest.ScriptInjectionWithPrecondition as per https://ci.brave.com/job/pr-brave-browser-pr6363_sync-v2-initial-merge_1.13.x/1/execution/node/676/log/. I'm not 100% sure if this is an intermittent issue but we've seen a few times before via the CR85 branch. Going to restart just in case.

20:31:50  [  FAILED  ] GreaselionServiceTest.ScriptInjectionWithPrecondition, where TypeParam =  and GetParam() =  (2669 ms)
20:31:50  
20:31:50  [600/602] GreaselionServiceTest.ScriptInjectionWithPrecondition (2840 ms)
20:31:50  [601/602] BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.PRE_UpgradePath/PreferencesForVersion068WithRewardsAndAdsEnabled_ForUnsupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled_ShouldNotShowOnboarding (483 ms)
20:31:50  [602/602] BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion068WithRewardsAndAdsEnabled_ForUnsupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled_ShouldNotShowOnboarding (353 ms)
20:31:50  1 test failed:
20:31:50      GreaselionServiceTest.ScriptInjectionWithPrecondition (../../brave/browser/greaselion/greaselion_browsertest.cc:263)

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Aug 7, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Aug 7, 2020

Restarting Win x64 again as we lost the spot instance/agent was removed as per https://ci.brave.com/job/pr-brave-browser-pr6363_sync-v2-initial-merge_1.13.x/2/execution/node/375/log/

01:54:51  Cannot contact i-0d57044b16f543d42: hudson.remoting.RequestAbortedException: java.io.IOException: Unexpected termination of the channel
01:59:57  Could not connect to i-0d57044b16f543d42 to send interrupt signal to process

@kjozwiak
Copy link
Member

kjozwiak commented Aug 7, 2020

@darkdh you'll most likely need to rebase this one as #6276 & brave/brave-browser#11026 landed in 1.13.x and 1.12.x which I believe is the reason the above is now failing init due to the following:

02:54:56  1 failed patches:
02:54:56  chrome/VERSION
02:54:56    - Patch applied because: No corresponding .patchinfo file was found.
02:54:56    - Error - Program git exited with error code 1.

@darkdh darkdh force-pushed the pr6363_sync-v2-initial-merge_1.13.x branch from 14a882f to d9894b2 Compare August 7, 2020 16:13
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.13.x approved after deliberating with @brave/uplift-approvers. QA has also verified the PR on Nightly as per #6363 (comment).

@kjozwiak kjozwiak merged commit 70ddd40 into 1.13.x Aug 10, 2020
@kjozwiak kjozwiak deleted the pr6363_sync-v2-initial-merge_1.13.x branch August 10, 2020 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants