init.sh syntax error corrected and skip 900 module for bsa/sbsa in acs_run_config#367
Merged
chetan-rathore merged 4 commits intoARM-software:SR_execution_enviromentfrom Apr 15, 2025
Conversation
Signed-off-by: Guru9902 <gururaj.revankar@arm.com>
skip BSA/SBSA exerciser module 900 in config file
chetan-rathore
added a commit
that referenced
this pull request
Apr 22, 2025
* log parser: comment prints not needed + file name small caps (#260) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Update init.sh : add ttySC0 for renesas platform (#261) * Improvements in log parser (#262) * Update init.sh : add ttySC0 for renesas platform * log parser changes --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * log parser improvements for manual to os tests and mvp to standalone (#263) * log parser improvements for manual to os tests and mvp to standalone * log parser improvements --------- Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * 3.0 development (#264) * minor syntax changes * Change MVP to Standalone --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * capsule update into standalone (#267) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * acs_info.json , acs summary into merge jsons, compliant capability into merge json (#268) * acs_info.json , acs summary into merge jsons, compliant capability into merge json * acs_info.txt removal --------- Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Automatically SecureBoot to Linux, post completion of BBSR SCT (#269) - added changes to enable automatic secureboot to linux, after completion BBSR SCT. Post boot FWTS and TPM checks were run. - Removed BBSR Linux Boot grub option. Signed-off-by: Amrathesh <amrathesh@arm.com> * boot_sources script improvements (#270) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Yocto DT build changes for glibc issue and reduce time taken by DT build (#271) * Build recipe which takes long time firt * Update woden.yml : Limit glibc locale packages * Update woden.yml * correct syntax of calling multiple yocto commands * Update build-systemready-dt-band-live-image.sh * Update build-systemready-dt-band-live-image.sh --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * 3.0_development (#272) * - Capsule update test issue. - Failed to test yocto_image.flag and capsule_update_check.flag - Fixed and optimized the capsule update test. Change-Id: I46c0cbfa54253c90487c5cab8522eddf1c48d430 * - Modified mount command with extra attributes - for proper mounting Change-Id: I2dffcf64d94edc501ddc8d5017d313501179acec --------- Co-authored-by: Sathisha S <sathisha.shivaramappa@arm.com> * Changes to upgrade the components for DT and SR band (#273) * Upgrade edk2 to edk2-stable202111 and sct to feb commit * Update ebbr-sct.bb: correct version fields. * correct commit id of edk2-stable202411 * use latest edk2-libc commit * Use 3.0_dev branch of bbr-acs * Linux version updated to v6.12, fwts version updated to 25.01.00 Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Comment added --------- Signed-off-by: Guru9902 <gururaj.revankar@arm.com> Co-authored-by: cherat01 <chetan.singh2@arm.com> Co-authored-by: chetan singh rathore <chetanrgithub@gmail.com> * Add error handling if git clone fails (#274) Co-authored-by: cherat01 <chetan.singh2@arm.com> * single reason formatting and some major changes in html and json (#275) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Adding wget & curl testing to ethtool-test script (#278) * Update ethtool-test.py * Update ethtool-test.sh * 3.0 development: Use buildroot mirror and changes in ebbr-sct for building latest edk2 (#279) * Use buildroot mirror * Update ebbr-sct.bb: export cc flags for latest edk2 build in ebbr-sct * Update ebbr-sct.bb: use latest edk2 in ebbr-sct * Corrected yocto path (#280) * Correct yocto image flag path * correct debug_dump stall print --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * Config tool updater and tools Readme (#283) Signed-off-by: Manjunatha D <manjunatha.d@arm.com> Co-authored-by: Manjunatha D <manjunatha.d@arm.com> * Added ScrtStartup.nsh for manual execution for DT image (#285) * - Capsule update test issue. - Failed to test yocto_image.flag and capsule_update_check.flag - Fixed and optimized the capsule update test. Change-Id: I46c0cbfa54253c90487c5cab8522eddf1c48d430 * - Modified mount command with extra attributes - for proper mounting Change-Id: I2dffcf64d94edc501ddc8d5017d313501179acec * - Added ScrtStartup.nsh for manual execution - Added ScrtStartup.nsh support for SystemReady-devicetree-band Change-Id: Ia8ff3404c1b2f1237d989564d5e59a6fe0c71923 --------- Co-authored-by: Sathisha S <sathisha.shivaramappa@arm.com> * Implementation and testing of seperate capsule_update.nsh for DT image (#286) * - Capsule update test issue. - Failed to test yocto_image.flag and capsule_update_check.flag - Fixed and optimized the capsule update test. Change-Id: I46c0cbfa54253c90487c5cab8522eddf1c48d430 * - Modified mount command with extra attributes - for proper mounting Change-Id: I2dffcf64d94edc501ddc8d5017d313501179acec * - Added ScrtStartup.nsh for manual execution - Added ScrtStartup.nsh support for SystemReady-devicetree-band Change-Id: Ia8ff3404c1b2f1237d989564d5e59a6fe0c71923 * - Implementation and testing of seperate capsule_update.nsh - Implemented seperate capsule_update.nsh - Tested the same changes on Buildroot and Corstone1000 platforms Change-Id: I1addd3e0e4aa985e3ba631f0d815c0266cb5ea7a --------- Co-authored-by: Sathisha S <sathisha.shivaramappa@arm.com> * Fixed ACPI command issue for DT image while running debug_dump.nsh (#287) * - Capsule update test issue. - Failed to test yocto_image.flag and capsule_update_check.flag - Fixed and optimized the capsule update test. Change-Id: I46c0cbfa54253c90487c5cab8522eddf1c48d430 * - Modified mount command with extra attributes - for proper mounting Change-Id: I2dffcf64d94edc501ddc8d5017d313501179acec * - Added ScrtStartup.nsh for manual execution - Added ScrtStartup.nsh support for SystemReady-devicetree-band Change-Id: Ia8ff3404c1b2f1237d989564d5e59a6fe0c71923 * - Implementation and testing of seperate capsule_update.nsh - Implemented seperate capsule_update.nsh - Tested the same changes on Buildroot and Corstone1000 platforms Change-Id: I1addd3e0e4aa985e3ba631f0d815c0266cb5ea7a * - Fixed acpi command issue for DT image - For DT image, acpi command should not run while executing the debug_dump.nsh and fixed the same issue. --------- Co-authored-by: Sathisha S <sathisha.shivaramappa@arm.com> * Remove ESP part type for BOOT_ACS partiton (#288) - Ensure ACS image excludes ESP to validate system configuration issues. Signed-off-by: Amrathesh <amrathesh@arm.com> * sct and edks2 parser changes (#289) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * psci checker added in merged json and html under standalone tests (#290) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Correct yocto_image.flag in main log parser script (#291) * ethtool wget and curl tests added in json and htmls (#292) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * boot sources script changes for enhancements (#293) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * dump improvements : print mandatory test logs as error and recommended as warning (#294) * If mandatory test log is missing print error * comment duplicate psci logs to json call --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * major changes for mandatory or recommended suites , waiver changes (#295) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Addition of acs test tools guide (#296) * Create acs_test_tools_guide.md Initial check-in of ACS test tools guide, which details for each Band the test tools which are run, their runtime environment and path of results * Minor updates * Improvements for complaince calculation (#298) Co-authored-by: cherat01 <chetan.singh2@arm.com> * changes in compliance result (#299) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Read write processing logs_to_json.py changes in standalone test for read write check (#300) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * case added where json is formed but hasnt run any test, it'll be considered failure for compliance and no user prompt in read write logs is now skipped not failed (#301) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * dtschema updated 2025.2 , linux kernel source version updated to 6.10 in process_scehma (#302) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * linux command line options for early linux boot prints (#303) * Update startup.nsh : add earlycon and serial console linux command line options * Update woden-image.bb : add command line options for early linux boot prints * Changes related to linux cmd line parametr, DT results template, minor capsule update (#304) * changes to linux command line parameter * dt results template changes * temp using bbr fork branch * use dt startup.nsh * create acs_results_template * Revert the bbr-acs source to main repo * Revert the bbr-acs source to main repo for DT * change capsuleupdate result log path to fw folder --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * Increase DT boot partition size to 350M (#305) * Post script logs are now parsed into json and html and in merged json. (#307) * POST PROCESSING logs are now parsed injto json and html and in merged json * improvements logs_to_json.py n/a for reason and no info cases printed --------- Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * boot partition must be aligned to 1024 (#308) * Image partition needs to be aligned to 1024 ..increase to 360 MB * Correct the name of image in rm command * handle case where boot partition is not mapped to fs0 (#309) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Handling corner cases (#310) * fixes in capsule-on-disk logs, acs_config for dt * Handle the case where other boot medium also have Image file --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * Minor changes for os test processing (#311) Co-authored-by: cherat01 <chetan.singh2@arm.com> * correct post script path relative to LOGS_PATH (#312) * SR band, consider sbsa mandatory based on run config (#313) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Added BBSR Disable Secure Boot instructions (#315) - added instruction required to disable Secure Boot on systems utilizing either U-Boot or UEFI firmware by leveraging the SystemReady ACS test keys. * print if suite is recommened or mandatory as per srs (#316) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Move the guide folder at tip of repository (#317) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Use the BSA and SBSA 25.03 rel tag (#318) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Changes to make SR startup more readable * Minor echo related changes in uefi scripts (#320) * Update startup.nsh: Minor echo prints * Update debug_dump.nsh: Comment duplicate echo * Syntax related changes: fix tabs and whitespaces, add uefi debug prints (#321) * Added debug prints to follow complaince run * replace tabs with spaces, add debug echo in uefi scripts --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * test category changes(now merge json has waivable,srs scope, and main readiness grouping fields captured from test category.json), apply waiver changed for changes (#322) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * feedback changes for corner cases FWTS (#323) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * SR execution enviroment changes (#324) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Added scrt option and config file check to Parser.efi (#325) * Execution environment changes (#328) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Update startup.nsh (#329) * Parser.efi modified, Variable checks added (#335) * Parser app changes added Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Variable checks added Signed-off-by: Guru9902 <gururaj.revankar@arm.com> --------- Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Pull in latest changes of 3.0 development branch to SR Execution Enviroment branch (#336) * fix for soc family extraction and sleep timer increase after log parser (#327) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * bbsr tpm logs are now parsed into json and htmls, and some minor improv (#333) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Upgrade ACS version for 3.0.1 release (#334) Co-authored-by: cherat01 <chetan.singh2@arm.com> --------- Co-authored-by: Ashish sharma <55487856+Ashishsharma1903@users.noreply.github.com> Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> Co-authored-by: cherat01 <chetan.singh2@arm.com> * Variable check syntax corrected (#337) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Install gnu-efi dependencies in github runners (#340) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Sync SR EE branch with 3.0_dev changes (#341) * fix for soc family extraction and sleep timer increase after log parser (#327) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * bbsr tpm logs are now parsed into json and htmls, and some minor improv (#333) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Upgrade ACS version for 3.0.1 release (#334) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Install gnu-efi dependencies in github runners (#339) Co-authored-by: cherat01 <chetan.singh2@arm.com> --------- Co-authored-by: Ashish sharma <55487856+Ashishsharma1903@users.noreply.github.com> Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> Co-authored-by: cherat01 <chetan.singh2@arm.com> * acs_run_config parameters resetted to default value for automation run and SCT rollbacked to stable version (#342) * Rollback SCT commit to stable 202406 * updates to acs_run_config with default values --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * Changes for bbsr in SR execution enviroment (#343) * Separate section for BBSR SCT and BBSR FWTS * Update bbsr_startup.nsh : changes for BBSR in execution enviroment * BBSR option added in parser.efi (#344) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * sign the parser.efi (#345) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Changes for Linux execution enviroment (#346) * Linux EE changes for SR * Added changes for bsa and sbsa run based on config file --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * Mount the results parition for even noacs option (#347) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Tabs and whitespaces corrected, debug message for Linux ee (#348) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Parser.py script added to SR image,path update in Parser.py (#349) * Update Parser.py * Update make_image.sh * init.sh updated with variable checks (#350) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * bsa,sbsa,fwts linux EE run scripts added (#351) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Comments added to acs_run_config.ini (#353) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Keep kernel version to 6.10 (#356) * Handling corner cases for SR execution enviroment (#357) * log parser enhacements for fwts * handling results folder creation when linux sbsa is run alone * Direct the output to FWTSResults.log when fwts is run as part of execution enviroment --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * bbsr fwts,tpm option added under config control (#358) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * parser app build script added (#360) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * Update acs_run_config.ini : SBSA must be false by default in automation run * Correct the BSA verbose parsing * Update acs_config.txt : Correct ACS version tag for SR band * Update sctversion.patch: Corrected SBBR tag for 3.0.1 release * Added sbbr fwts modules in config file * Added config file option for BBSR SCT * bbsr command parsing option added to parser.efi (#361) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * sctversion updates (#362) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Update secure_init.sh: syntax error corrected * Update startup.nsh (#363) * Use latest xBSA code bases * Update secure_init.sh: Correcting syntax error * Increase sync time for acs results * Parser related changes for app and script (#364) * Colon added at end of FS%i * Update bsa.nsh : handle cases when bsa command not generated * Update Parser_app.c: generate bsa command if -bsa flag passed parser.efi should not check if automation_bsa is true or not for generating bsacommand. uefi script will check that logic. * generate sbsa, sct, bbsrsct command if required flag passed * Update sbsa.nsh : handle cases when bsa command not generated * Updates to bsa and sbsa parsing as per linux parameters supported * Minor changes while echoing of uefi var --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> * Not run SBSA linux by default if not enabled in config file (#365) * init.sh syntax error corrected and skip 900 module for bsa/sbsa in acs_run_config (#367) * Update init.sh : correct if else loop syntax * Update init.sh * skip BSA/SBSA exerciser module 900 in config file Signed-off-by: Guru9902 <gururaj.revankar@arm.com> --------- Signed-off-by: Guru9902 <gururaj.revankar@arm.com> Co-authored-by: Guru9902 <gururaj.revankar@arm.com> * Minor changes related to syntaz and version (#368) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Skip parsing acs_run_config for DT image (#370) * Update bsa.nsh Update bsa.nsh : Handle case for skipping parser.efi for DT band * Change to yocto_image flag from bsa_dt flag * Update secure_init.sh : Not run parser script for DT * whitespace remove (#373) Co-authored-by: cherat01 <chetan.singh2@arm.com> * Parser app code updated to handle memory leaks (#375) Signed-off-by: Guru9902 <gururaj.revankar@arm.com> * BBSR extension compliance results changes (#377) Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> * Addign Weasyprint(PDF conversion package) to IR (#378) Signed-off-by: Manjunatha D <manjunatha.d@arm.com> Co-authored-by: Manjunatha D <manjunatha.d@arm.com> * Addign Weasyprint(PDF conversion package) to IR (#379) Signed-off-by: Manjunatha D <manjunatha.d@arm.com> Co-authored-by: Manjunatha D <manjunatha.d@arm.com> * clone the 3.0.1 branch in systemready-scripts for ACS 3.0.1 (#380) * Add dependency packages for html to pdf conversion, minor prints changes (#381) * Update woden-image.bb : Adding dependency packages for html to pdf conversion tool * Update main_log_parser.sh : Convert ACS summary to pdf for DT band only * Update secure_init.sh : comment the duplicate run completed prints * Update init.sh : minor print change * Use post script 3.0.1 branch for 3.0.1 release (#382) * Update systemready-scripts.bb : Use 3.0.1 branch for 3.0.1 release * Update main_log_parser.sh: minor correction * Corrected ebbr acs and spec versions in acs summary (#383) * Updated ebbr version for SR 3.0.1 release * Corrected EBBR specification version --------- Co-authored-by: cherat01 <chetan.singh2@arm.com> --------- Signed-off-by: Amrathesh <amrathesh@arm.com> Signed-off-by: Guru9902 <gururaj.revankar@arm.com> Signed-off-by: Manjunatha D <manjunatha.d@arm.com> Co-authored-by: cherat01 <chetan.singh2@arm.com> Co-authored-by: Ashish sharma <55487856+Ashishsharma1903@users.noreply.github.com> Co-authored-by: Ashish Sharma <ashsha06@a081966.arm.com> Co-authored-by: Amrathesh . <48640575+amrathesh@users.noreply.github.com> Co-authored-by: sathishas89 <49908026+sathishas89@users.noreply.github.com> Co-authored-by: Sathisha S <sathisha.shivaramappa@arm.com> Co-authored-by: Gururaj <108717118+Guru9902@users.noreply.github.com> Co-authored-by: manjunath3divakar <134777680+manjunath3divakar@users.noreply.github.com> Co-authored-by: Manjunatha D <manjunatha.d@arm.com> Co-authored-by: Guru9902 <gururaj.revankar@arm.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.