Merge pull request #1 from ARMmbed/master

sync with source repo

Author: juliensu

.github/issue_template.md

@@ -30,6 +30,17 @@
 
 
 #### What version of Mbed-os are you using (tag or sha) ?
+<!--
+    For a released version please provide the release tag (this can be found as per the instructions below)
+
+    mbed-os version can be found in /platform/mbed_version.h. The tag can be reconstructed as follows:
+    mbed-os-MBED_MAJOR_VERSION.MBED_MINOR_VERSION.MBED_PATCH_VERSION
+ 
+    Master branch is indicated by 'mbed-os-99.99.99
+    
+    For an issue found on Master please provide the sha being used.
+-->
+
 
 #### What version(s) of tools are you using. List all that apply (E.g. mbed-cli)
 

.mergify.yml

@@ -0,0 +1,165 @@
+#
+# Copyright (c) 2020, Arm Limited and affiliates.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Mergify follow our workflow: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html
+# Inital state (needs: review) is done by internal reviewer bot
+
+# Notes: conditions do not check if label is already there if we add or remove later, this is to limit Github API access to
+# minimum. If a label is already there and we add it again, nothing should happen (we do 1 less access to Github).
+# For instance for needs: work if CI failed, we just add a label as action, don't check if needs: works is already there.
+#
+# Reviewers request needs write access to block PR, otherwise it's just a suggestion on Github, not PR block
+
+pull_request_rules:
+  # From needs: review to needs: work - reviewers request
+  - name: "label needs: work when changes were requested"
+    conditions:
+      # Reviewers
+      - "#changes-requested-reviews-by>0"
+    actions:
+      label:
+        add: ['needs: work']
+        remove: ['needs: review', 'needs: CI']
+
+  # From needs: review to needs: work - CI failure
+  - name: "label needs: work when travis-ci failed"
+    conditions:
+      # Travis failing
+      - status-failure~=continuous-integration/travis-ci/pr
+    actions:
+      label:
+        add: ['needs: work']
+        remove: ['needs: review', 'needs: CI']
+
+  # From needs: review to needs: work - CI failure
+  - name: "label needs: work when Jenkins CI failed - pr head"
+    conditions:
+      # Jenkins CI failing
+      - status-failure~=continuous-integration/jenkins/pr-head
+    actions:
+      label:
+        add: ['needs: work']
+        remove: ['needs: review','needs: CI']
+
+  # From needs: review to needs: work - CI failure
+  - name: "label needs: work when Jenkins CI failed - any of the pipeline"
+    conditions:
+      # Jenkins CI failing - any of the pipeline
+      - status-failure~=^jenkins-ci
+    actions:
+      label:
+        add: ['needs: work']
+        remove: ['needs: review', 'needs: CI']
+
+  # From needs: review or needs: work to needs: CI. One approval means we should be good to start CI
+  - name: "label needs: CI when at least one reviewers approval"
+    conditions:
+      # Labels
+      - "label!=needs: preceding PR"
+
+      # Reviewers
+      - "#changes-requested-reviews-by=0"
+      - "#approved-reviews-by>=1"
+
+      # CI green policy, at least Travis should be green
+      - status-success~=continuous-integration/travis-ci/pr
+      # new CI needs to be done (neutral does not work, lets check if it failed or passed, if none, we need to run again)
+      - -status-success~=continuous-integration/jenkins/pr-head
+      - -status-failure~=continuous-integration/jenkins/pr-head
+    actions:
+      label:
+        add: ['needs: CI']
+        remove: ['needs: review', 'needs: work']
+
+  # Remove reviews after the branch is updated. This yet does not allow
+  # any other action like labels, etc. See mergify-engine/issues/360
+  - name: remove outdated reviews
+    conditions: []
+    actions:
+      dismiss_reviews:
+        approved: True
+        changes_requested: True
+
+  # Conflict in the PR - needs: work and a comment to notify a user
+  - name: "label needs: work when there is a conflict"
+    conditions:
+      - conflict
+    actions:
+      label:
+        add: ['needs: work']
+        remove: ['needs: review', 'needs: CI']
+        
+      comment:
+        message: This PR cannot be merged due to conflicts. Please rebase to resolve them.
+
+  - name: "add label feature branch for feature branch additions"
+    conditions:
+      - base~=^feature
+    actions:
+      label:
+        add: ['release-version: feature branch']
+
+  # Ready for integration. Not yet auto merge, will be enabled once carefuly tested
+  - name: label "ready for merge" when ready
+    conditions:
+      # Labels
+      - "label!=do not merge"
+      - "label=needs: CI"
+
+      # Reviewers
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+
+      # CI green policy
+      - status-success~=continuous-integration/travis-ci/pr
+      # Internal Jenkins - we rely on PR head to provide status
+      - status-success~=continuous-integration/jenkins/pr-head
+      # any of the jenkins pipeline needs to be green. We rely on not failure means all good (if skipped or executed) 
+      - -status-failure~=^jenkins-ci
+    actions:
+      label:
+        add: ['ready for merge']
+        remove: ['needs: CI']
+
+  # Clean-up after merge
+  - name: remove ready for merge when merged
+    conditions:
+      - merged
+      - "label=ready for merge"
+    actions:
+      label:
+        remove: ['ready for merge']
+
+  - name: add "do not merge" label when WIP is in title
+    conditions:
+       - title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
+    actions:
+      label:
+        add: ['do not merge']
+
+  # Check if version label is applied
+  - name: release version is a must for merged PRs
+    conditions:
+      - merged
+      - -label~=^(release-version)
+      - -label~=^(Release review required)   
+    actions:
+      label:
+        add: ['release version missing']
+      comment:
+        message: This PR does not contain release version label after merging.
+
+

TESTS/configs/baremetal.json

@@ -37,6 +37,24 @@
     "target_overrides": {
         "*": {
             "mbed-trace.fea-ipv6": false
+        },
+        "K64F": {
+            "target.c_lib": "small"
+        },
+        "K66F": {
+            "target.c_lib": "small"
+        },
+        "NUCLEO_F303RE": {
+            "target.c_lib": "small"
+        },
+        "NUCLEO_F411RE": {
+            "target.c_lib": "small"
+        },
+        "NUCLEO_F429ZI": {
+            "target.c_lib": "small"
+        },
+        "DISCO_L475VG_IOT01A": {
+            "target.c_lib": "small"
         }
      }
 }

TESTS/host_tests/reset_reason.py

@@ -19,7 +19,7 @@
 
 DEFAULT_SYNC_DELAY = 4.0
 
-MSG_VALUE_WATCHDOG_PRESENT = 'wdg_present'
+MSG_VALUE_WATCHDOG_PRESENT = 1
 MSG_VALUE_DUMMY = '0'
 MSG_VALUE_RESET_REASON_GET = 'get'
 MSG_VALUE_RESET_REASON_CLEAR = 'clear'
@@ -66,6 +66,7 @@ class ResetReasonTest(BaseHostTest):
 
     def __init__(self):
         super(ResetReasonTest, self).__init__()
+        self.device_reasons = None
         self.device_has_watchdog = None
         self.raw_reset_reasons = set()
         self.sync_delay = DEFAULT_SYNC_DELAY
@@ -85,10 +86,13 @@ def setup(self):
     def cb_device_ready(self, key, value, timestamp):
         """Request a raw value of the reset_reason register.
 
-        Additionally, save the device's watchdog status on the first call.
+        Additionally, save the device's reset_reason capabilities
+        and the watchdog status on the first call.
         """
-        if self.device_has_watchdog is None:
-            self.device_has_watchdog = (value == MSG_VALUE_WATCHDOG_PRESENT)
+        if self.device_reasons is None:
+            reasons, wdg_status = (int(i, base=16) for i in value.split(','))
+            self.device_has_watchdog = (wdg_status == MSG_VALUE_WATCHDOG_PRESENT)
+            self.device_reasons = [k for k, v in RESET_REASONS.items() if (reasons & 1 << int(v))]
         self.send_kv(MSG_KEY_RESET_REASON_RAW, MSG_VALUE_RESET_REASON_GET)
 
     def cb_reset_reason_raw(self, key, value, timestamp):
@@ -133,35 +137,45 @@ def test_steps(self):
         __ignored_clear_ack = yield
 
         # Request a NVIC_SystemReset() call.
-        self.send_kv(MSG_KEY_DEVICE_RESET, MSG_VALUE_DEVICE_RESET_NVIC)
-        __ignored_reset_ack = yield
-        time.sleep(self.sync_delay)
-        self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
-        reset_reason = yield
-        raise_if_different(RESET_REASONS['SOFTWARE'], reset_reason, 'Wrong reset reason. ')
-        self.send_kv(MSG_KEY_RESET_REASON, MSG_VALUE_RESET_REASON_CLEAR)
-        __ignored_clear_ack = yield
+        expected_reason = 'SOFTWARE'
+        if expected_reason not in self.device_reasons:
+            self.log('Skipping the {} reset reason -- not supported.'.format(expected_reason))
+        else:
+            # Request a NVIC_SystemReset() call.
+            self.send_kv(MSG_KEY_DEVICE_RESET, MSG_VALUE_DEVICE_RESET_NVIC)
+            __ignored_reset_ack = yield
+            time.sleep(self.sync_delay)
+            self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
+            reset_reason = yield
+            raise_if_different(RESET_REASONS[expected_reason], reset_reason, 'Wrong reset reason. ')
+            self.send_kv(MSG_KEY_RESET_REASON, MSG_VALUE_RESET_REASON_CLEAR)
+            __ignored_clear_ack = yield
 
         # Reset the device using DAP.
-        self.reset()
-        __ignored_reset_ack = yield  # 'reset_complete'
-        time.sleep(self.sync_delay)
-        self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
-        reset_reason = yield
-        raise_if_different(RESET_REASONS['PIN_RESET'], reset_reason, 'Wrong reset reason. ')
-        self.send_kv(MSG_KEY_RESET_REASON, MSG_VALUE_RESET_REASON_CLEAR)
-        __ignored_clear_ack = yield
+        expected_reason = 'PIN_RESET'
+        if expected_reason not in self.device_reasons:
+            self.log('Skipping the {} reset reason -- not supported.'.format(expected_reason))
+        else:
+            self.reset()
+            __ignored_reset_ack = yield  # 'reset_complete'
+            time.sleep(self.sync_delay)
+            self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
+            reset_reason = yield
+            raise_if_different(RESET_REASONS[expected_reason], reset_reason, 'Wrong reset reason. ')
+            self.send_kv(MSG_KEY_RESET_REASON, MSG_VALUE_RESET_REASON_CLEAR)
+            __ignored_clear_ack = yield
 
         # Start a watchdog timer and wait for it to reset the device.
-        if not self.device_has_watchdog:
-            self.log('DUT does not have a watchdog. Skipping this reset reason.')
+        expected_reason = 'WATCHDOG'
+        if expected_reason not in self.device_reasons or not self.device_has_watchdog:
+            self.log('Skipping the {} reset reason -- not supported.'.format(expected_reason))
         else:
             self.send_kv(MSG_KEY_DEVICE_RESET, MSG_VALUE_DEVICE_RESET_WATCHDOG)
             __ignored_reset_ack = yield
             time.sleep(self.sync_delay)
             self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
             reset_reason = yield
-            raise_if_different(RESET_REASONS['WATCHDOG'], reset_reason, 'Wrong reset reason. ')
+            raise_if_different(RESET_REASONS[expected_reason], reset_reason, 'Wrong reset reason. ')
 
         # The sequence is correct -- test passed.
         yield True