Rebase watchdog feature branch

[ghost]

Description

Testing on CI before updating upstream branch

Pull request type

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

[ciarmcom]

@scartmell-arm, thank you for your changes.
@ARMmbed/mbed-os-crypto @ARMmbed/mbed-os-wan @ARMmbed/mbed-os-pan @ARMmbed/mbed-os-tools @ARMmbed/mbed-os-test @ARMmbed/mbed-os-ipcore @ARMmbed/mbed-os-mesh @ARMmbed/mbed-os-maintainers @ARMmbed/mbed-os-hal @ARMmbed/mbed-os-core @ARMmbed/mbed-os-tls @ARMmbed/mbed-os-storage please review.

[cmonr]

CI started

[mbed-ci]

Test run: FAILED

Summary: 3 of 7 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

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

[cmonr]

@scartmell-arm Please take a look at the build errors.

[bulislaw]

lol seriously??? @ARMmbed/mbed-os-maintainers that's a bug or at least wrong behaviour

@scartmell-arm, thank you for your changes.
@ARMmbed/mbed-os-crypto @ARMmbed/mbed-os-wan @ARMmbed/mbed-os-pan @ARMmbed/mbed-os-tools @ARMmbed/mbed-os-test @ARMmbed/mbed-os-ipcore @ARMmbed/mbed-os-mesh @ARMmbed/mbed-os-maintainers @ARMmbed/mbed-os-hal @ARMmbed/mbed-os-core @ARMmbed/mbed-os-tls @ARMmbed/mbed-os-storage please review.

[kjbracey]

You can't actually rebase a feature branch via a GitHub PR. Normally they're just rebased by a maintainer. None of the results of pressing the "Merge" button on this PR would be acceptable, no matter how you constructed the PR.

The automation is making a mess here because the result of this PR would be a mess.

If the rebase is simple, just ask a maintainer to do it.

If you want to make a PR in order to run CI now on the potential result of such a feature rebase, that may well be worthwhile. (Otherwise you'll only see failures on the next PR to that feature). Or maybe you just need to resolve conflicts manually, and a PR is a reasonable way to post the result.

I would do it by something like:

git checkout -b rebased_feature_xx origin/feature_xxx
git rebase origin/master
git push fork rebased_feature_xx
Create PR for rebased_feature_xx against master
Make sure the PR is flagged as DO NOT MERGE and indicate that it's for CI of a feature rebase only
Wait for CI to get run on that PR
If it passes, tell maintainers to reset feature_xx to that commit and close the PR

(And that would flag for review all the teams whose files are currently being touched by the feature branch, which seems reasonable. Review wouldn't normally be required for a rebase anyway, but they may want to be kept informed).

[cmonr]

CI started

[cmonr]

@scartmell-arm Please take a look at the build failures. Looks like this still has a problem with NRF52 targets.

[mbed-ci]

Test run: FAILED

Summary: 3 of 7 test jobs failed
Build number : 3
Build artifacts

Failed test jobs:

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

[0xc0170]

The failures still needs to be addressed here

[0xc0170]

CI restarted

[mbed-ci]

Test run: FAILED

Summary: 3 of 7 test jobs failed
Build number : 4
Build artifacts

Failed test jobs:

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

[0xc0170]

Ci restarted

[mbed-ci]

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 5
Build artifacts

[0xc0170]

The branch is ready for updating !

[0xc0170]

Branch updated