PSA release script update: add toolchain option #10606

jeromecoutant · 2019-05-17T10:55:13Z

Description

2 updates:

be able to compile Secure part with a given tool chain
avoid to delete full BUILD directory each time

$ python tools/psa/release.py -h
usage: release.py [-h] [-m MCU] [-t TC] [-d] [-q] [-l] [--commit]
                  [--skip-tests] [-x ...]

optional arguments:
  -h, --help           show this help message and exit
  -m MCU, --mcu MCU    build for the given MCU
  -t TC, --tc TC       build for the given tool chain (default is
                       default_toolchain)
  -d, --debug          set build profile to debug
  -q, --quiet          No Build log will be printed
  -l, --list           Print supported PSA secure targets
  --commit             create a git commit for each platform
  --skip-tests         skip the test build phase
  -x ..., --extra ...  additional build parameters

Pull request type

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

Reviewers

@ARMmbed/mbed-os-psa

ciarmcom · 2019-05-17T11:00:29Z

@jeromecoutant, thank you for your changes.
@ARMmbed/mbed-os-tools @ARMmbed/mbed-os-maintainers please review.

orenc17

Also please add documentation to tools/psa/README.md

orenc17 · 2019-05-17T11:21:02Z

tools/psa/release.py

@@ -74,7 +74,12 @@ def _get_target_info(target):
    if not os.path.exists(delivery_dir):
        raise Exception("{} does not have delivery_dir".format(target))

-    return tuple([TARGET_MAP[target].name,
+    if toolchain:


Add assertion that the target actually supports the toolchain

orenc17 · 2019-05-17T11:24:40Z

tools/psa/release.py

@@ -182,6 +192,11 @@ def build_default_image(target, toolchain, profile, args):
    logger.info("Building default image for {} using {} with {} profile".format(
        target, toolchain, profile))

+    build_dir = os.path.join(ROOT, 'BUILD', target)


use this variable in line 206

orenc17 · 2019-05-17T11:25:28Z

tools/psa/release.py

@@ -142,6 +147,11 @@ def build_tests(target, toolchain, profile, args):
    :param profile: build profile.
    :param args: list of extra arguments.
    """
+    build_dir = os.path.join(ROOT, 'BUILD', 'tests', target)


use this variable in line 168

orenc17 · 2019-05-17T11:29:08Z

tools/psa/release.py

-
-    os.makedirs(build_dir)
-    logger.info("BUILD directory created in {}".format(build_dir))
+    if not os.path.exists(build_dir):


i believe this change is for incremental builds, if that's the case add a -c option to the argument parser for a clean build

No, BUILd part for the specific target is still deleted as the current behavior.
This patch just avoid to delete other targets.

orenc17 · 2019-05-17T12:14:52Z

tools/psa/release.py

@@ -74,7 +74,14 @@ def _get_target_info(target):
    if not os.path.exists(delivery_dir):
        raise Exception("{} does not have delivery_dir".format(target))

-    return tuple([TARGET_MAP[target].name,
+    if toolchain:
+        if not TOOLCHAIN_CLASSES[toolchain].check_executable():


Suggested change

if not TOOLCHAIN_CLASSES[toolchain].check_executable():

if toolchain not in TARGET_MAP[target].supported_toolchains:

@jeromecoutant it should be like this
the executeable_check is done in main()

orenc17 · 2019-05-17T13:57:09Z

tools/psa/release.py

-    return tuple([TARGET_MAP[target].name,
+    if toolchain:
+        if toolchain not in TARGET_MAP[target].supported_toolchains:
+            raise Exception("Toolchain {} was not found in PATH".format(toolchain))


Suggested change

raise Exception("Toolchain {} was not found in PATH".format(toolchain))

raise Exception("Toolchain {} is not supported by {}".format(toolchain, TARGET_MAP[target].name))

Error message should change as well

0xc0170 · 2019-05-20T08:53:21Z

CI started

mbed-ci · 2019-05-20T11:44:53Z

Test run: FAILED

Summary: 1 of 11 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_exporter

orenc17 · 2019-05-20T12:26:11Z

exporter failed because of a license checkout failure...can someone restart?

0xc0170 · 2019-05-21T09:08:16Z

Restarted

ciarmcom requested review from a team May 17, 2019 11:00

ciarmcom added the needs: review label May 17, 2019

orenc17 suggested changes May 17, 2019

View reviewed changes

jeromecoutant force-pushed the PR_PSAscript branch from 5fe65e9 to 4f02e0b Compare May 17, 2019 12:03

orenc17 reviewed May 17, 2019

View reviewed changes

jeromecoutant force-pushed the PR_PSAscript branch from 4f02e0b to 392cc7d Compare May 17, 2019 13:11

orenc17 reviewed May 17, 2019

View reviewed changes

PSA release script update: add toolchain option

79ea266

jeromecoutant force-pushed the PR_PSAscript branch from 392cc7d to 79ea266 Compare May 17, 2019 14:33

orenc17 approved these changes May 17, 2019

View reviewed changes

0xc0170 approved these changes May 20, 2019

View reviewed changes

0xc0170 added needs: CI and removed needs: review labels May 20, 2019

0xc0170 added release-version: 5.13.0-rc1 ready for merge and removed needs: CI labels May 21, 2019

0xc0170 merged commit 77ca32d into ARMmbed:master May 21, 2019

0xc0170 removed the ready for merge label May 21, 2019

jeromecoutant deleted the PR_PSAscript branch May 21, 2019 15:44

	if not TOOLCHAIN_CLASSES[toolchain].check_executable():
	if toolchain not in TARGET_MAP[target].supported_toolchains:

	raise Exception("Toolchain {} was not found in PATH".format(toolchain))
	raise Exception("Toolchain {} is not supported by {}".format(toolchain, TARGET_MAP[target].name))

PSA release script update: add toolchain option #10606

PSA release script update: add toolchain option #10606

Uh oh!

Conversation

jeromecoutant commented May 17, 2019

Description

Pull request type

Reviewers

Uh oh!

ciarmcom commented May 17, 2019

Uh oh!

orenc17 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xc0170 commented May 20, 2019

Uh oh!

mbed-ci commented May 20, 2019

Uh oh!

orenc17 commented May 20, 2019

Uh oh!

0xc0170 commented May 21, 2019

Uh oh!

Uh oh!