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

Feature watchdog #9840

Closed
wants to merge 75 commits into from
Closed

Feature watchdog #9840

wants to merge 75 commits into from

Conversation

rajkan01
Copy link
Contributor

@rajkan01 rajkan01 commented Feb 25, 2019

Description

Based on Review comments from PR #9243, rebased feature-watchdog against master branch

Pull request type

[ ] Fix
[x] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

Release Notes

@cmonr cmonr changed the base branch from feature-watchdog to master February 25, 2019 15:08
@adbridge
Copy link
Contributor

ci started

@cmonr
Copy link
Contributor

cmonr commented Feb 25, 2019

Fyi, changed the base branch to ARMmbed/master instead of the feature branch.

If the rebased branch attempts to target the curent feature branch, GitHub attempts to create a merge commit between the two, which isn't what we want to put through CI.

Instead, targeting ARMmbed/master creates a merge commit that's more appropriate for what we're trying to do with this PR.

Once this passes CI and is OK'd by reviewers, it will be closed and maintainers will force-push the new feature branch.

Some more details can be found here: #8989 (comment)
Official docs coming soon (since we're finally needing to rebase feature branches more often 😁 )

@cmonr
Copy link
Contributor

cmonr commented Feb 25, 2019

@rajkan01 Was this rebased against your local master branch?

The TravisCI test list appears to be missing some improvements, and your local master branch appears a bit out of date:

This branch is 1219 commits behind ARMmbed:master.

@rajkan01
Copy link
Contributor Author

rajkan01 commented Feb 25, 2019 via email

@cmonr
Copy link
Contributor

cmonr commented Feb 25, 2019

CI restarted.

@cmonr
Copy link
Contributor

cmonr commented Feb 25, 2019

@rajkan01 Let us know when this is ready to be tested against CI

@rajkan01
Copy link
Contributor Author

rajkan01 commented Feb 25, 2019 via email

@cmonr
Copy link
Contributor

cmonr commented Feb 25, 2019

@rajkan01 It looks like one of the Travis CI jobs failed. Please fix the typo, then we can get Jenkins CI started.

@cmonr
Copy link
Contributor

cmonr commented Feb 25, 2019

CI started

@mbed-ci
Copy link

mbed-ci commented Feb 25, 2019

Test run: FAILED

Summary: 6 of 8 test jobs failed
Build number : 3
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_mbed2-build-GCC_ARM
  • jenkins-ci/mbed-os-ci_mbed2-build-ARM
  • jenkins-ci/mbed-os-ci_mbed2-build-IAR
  • jenkins-ci/mbed-os-ci_build-GCC_ARM
  • jenkins-ci/mbed-os-ci_build-IAR
  • jenkins-ci/mbed-os-ci_build-ARM

@cmonr
Copy link
Contributor

cmonr commented Feb 25, 2019

@rajkan01 Please take a look at the build failures.

It appears that there are reset tests that have some issues.

@fkjagodzinski
Copy link
Member

@rajkan01 I think your branch is missing a few commits that the original feature-watchdog had. There are reset_reason fixes from @scartmell-arm among them.

@rajkan01 rajkan01 changed the base branch from master to feature-watchdog February 26, 2019 11:12
@rajkan01
Copy link
Contributor Author

rajkan01 commented Mar 7, 2019

there's a conflict, please rebase

I resolved the conflicts, Please start the CI

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 7, 2019

CI restarted

@mbed-ci
Copy link

mbed-ci commented Mar 7, 2019

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 12
Build artifacts

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 7, 2019

@rajkan01 @donatieng This rebase is ready to be pushed t o the feature branch!

@cmonr
Copy link
Contributor

cmonr commented Mar 7, 2019

@rajkan01 @donatieng Feature branch rebase complete.

ARMmbed/feature-watchdog is now the same as rajkan01:feature-watchdog

@jeromecoutant
Copy link
Collaborator

ARMmbed/feature-watchdog is now the same as rajkan01:feature-watchdog

Then, when is the target to merge feature branch to master ?

@rajkan01
Copy link
Contributor Author

ARMmbed/feature-watchdog is now the same as rajkan01:feature-watchdog

Then, when is the target to merge feature branch to master ?

once feature-watchdog-v1-rb branch changes get merged..

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.