From 2c07d53f6a22ebacb2e7db49250cf122a6d9459d Mon Sep 17 00:00:00 2001 From: Alexander Zilberkant Date: Mon, 10 Aug 2020 21:47:59 +0300 Subject: [PATCH 1/3] fix test - add new header format --- TESTS/smoke/mbed_app.json.TEMPLATE | 12 ++++++++++-- configs/test_configs/greentea.json | 9 ++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/TESTS/smoke/mbed_app.json.TEMPLATE b/TESTS/smoke/mbed_app.json.TEMPLATE index 49780fe..f2358de 100644 --- a/TESTS/smoke/mbed_app.json.TEMPLATE +++ b/TESTS/smoke/mbed_app.json.TEMPLATE @@ -9,7 +9,15 @@ "platform.stdio-baud-rate": 115200, "target.bootloader_img" : "BOOTLOADER_BIN", "target.header_offset" : "HEADER_OFFSET", - "target.app_offset" : "APP_OFFSET" + "target.app_offset" : "APP_OFFSET", + "target.header_format": [ + ["magic", "const", "32le", "0x5c0253a3"], + ["firmwareSize", "size", "32le", ["application"]], + ["firmwareVersion", "const", "64le", "0x0"], + ["firmwareDigest", "digest", "SHA256", "application"], + ["precursorDigest", "digest", "SHA256", "application"] + ] } } -} \ No newline at end of file +} + diff --git a/configs/test_configs/greentea.json b/configs/test_configs/greentea.json index 43ba1ac..9562dac 100755 --- a/configs/test_configs/greentea.json +++ b/configs/test_configs/greentea.json @@ -41,7 +41,14 @@ "mbed-bootloader.application-start-address" : "(MBED_ROM_START + MBED_BOOTLOADER_SIZE + MBED_BOOTLOADER_ACTIVE_HEADER_REGION_SIZE)", "update-client.storage-locations" : 1, "update-client.application-details" : "(MBED_ROM_START + MBED_BOOTLOADER_SIZE)", - "target.extra_labels_remove" : [ "PSA" ] + "target.extra_labels_remove" : [ "PSA" ], + "target.header_format": [ + ["magic", "const", "32le", "0x5c0253a3"], + ["firmwareSize", "size", "32le", ["application"]], + ["firmwareVersion", "const", "64le", "0x0"], + ["firmwareDigest", "digest", "SHA256", "application"], + ["precursorDigest", "digest", "SHA256", "application"] + ] } } } From 22d0440309cc149721b1ee3582d3471348adb0a1 Mon Sep 17 00:00:00 2001 From: Alexander Zilberkant Date: Mon, 10 Aug 2020 23:20:02 +0300 Subject: [PATCH 2/3] fix smoke/comfigs.md --- TESTS/smoke/configs.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/TESTS/smoke/configs.md b/TESTS/smoke/configs.md index b064f55..2bac3b8 100644 --- a/TESTS/smoke/configs.md +++ b/TESTS/smoke/configs.md @@ -4,13 +4,9 @@ Following table is parsed automatically by build scripts, so follow the format E |TARGET|BOOTLOADER_BIN|HEADER_OFFSET|APP_OFFSET|UPDATE_HEADER_OFFSET|UPDATE_APP_OFFSET| |------|--------------|-------------|---------|--------------------|------------------| -|DISCO_L475VG_IOT01A|../../BUILD/mbed_app/DISCO_L475VG_IOT01A/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x80000|0x80070| -|K64F|../../BUILD/mbed_app/K64F/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x80000|0x80070| -|NRF52840_DK|../../BUILD/mbed_app/NRF52840_DK/GCC_ARM/mbed-bootloader.hex|0x8000|0x8400|0x80000|0x80070| -|NUCLEO_F303RE|../../BUILD/mbed_app/NUCLEO_F303RE/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x40000|0x40070| -|NUCLEO_F411RE|../../BUILD/mbed_app/NUCLEO_F411RE/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x40000|0x40070| -|NUCLEO_F429ZI|../../BUILD/mbed_app/NUCLEO_F429ZI/GCC_ARM/mbed-bootloader.bin|0x8000|0x8400|0x100000|0x100070| -|DISCO_F769NI|../../BUILD/mbed_app/DISCO_F769NI/GCC_ARM/mbed-bootloader.bin|0x40000|0x40400|0x100000|0x100070| +|DISCO_L475VG_IOT01A|../../BUILD/mbed_app/DISCO_L475VG_IOT01A/GCC_ARM/mbed-bootloader.bin|0x8000|0x8200|0x80000|0x80070| +|K64F|../../BUILD/mbed_app/K64F/GCC_ARM/mbed-bootloader.bin|0x8000|0x8200|0x80000|0x80070| +|NRF52840_DK|../../BUILD/mbed_app/NRF52840_DK/GCC_ARM/mbed-bootloader.hex|0x8000|0x8200|0x80000|0x80070| ## Finding the values From f5e1d20d1048ad66a26de37ca05a00a8aa3b4c42 Mon Sep 17 00:00:00 2001 From: Alexander Zilberkant Date: Tue, 11 Aug 2020 10:03:52 +0300 Subject: [PATCH 3/3] disable smoke test as the candidate layout is different --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b90f60..4b3112c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -303,6 +303,7 @@ def ReleaseStep() { timestamps { parallel "deploy_bootloader": deployBootloaderRepoStep() parallel buildStepsForParallel - parallel smokeTests + runStepsForParallel + // parallel smokeTests + runStepsForParallel + parallel runStepsForParallel parallel "release_bootloader": ReleaseStep() }