From 1b9f93de496e68dec4e9e1cca337ab68fadb8e8f Mon Sep 17 00:00:00 2001 From: Ryan Roberts Date: Tue, 20 Dec 2022 14:17:57 +0000 Subject: [PATCH 1/2] test: Add --smoke-test option to run a subset of tests --smoke-test will cause only a single arch variant to be tested. Signed-off-by: Ryan Roberts --- test/test.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/test/test.py b/test/test.py index 8d8f677..2380436 100755 --- a/test/test.py +++ b/test/test.py @@ -159,13 +159,15 @@ def run_config_bootwrap(config, bootwrap, rootfs, overlay=None, runtime=120): run_config(config, overlay, f'{bootwrap} {rootfs}', runtime) -def do_main(): - for arch in ARCHES: +def do_main(smoke_test): + arches = [ARCHES[-1]] if smoke_test else ARCHES + + for arch in arches: build_configs(CONFIGS, arch) for config in CONFIGS: run_config_kern(config, KERNEL, ROOTFS, arch) - for arch in ARCHES: + for arch in arches: build_configs(['bootwrapper.yaml'], arch) run_config_bootwrap('bootwrapper.yaml', BOOTWRAPPER, ROOTFS, arch) @@ -192,6 +194,10 @@ def main(): help="""If using a container runtime, specifies the name of the image to use. Defaults to the official shrinkwrap image.""") + parser.add_argument('-s', '--smoke-test', + required=False, default=False, action='store_true', + help="""If specified, run a smaller selection of tests.""") + args = parser.parse_args() global RUNTIME @@ -199,7 +205,7 @@ def main(): RUNTIME = args.runtime IMAGE = args.image - do_main() + do_main(args.smoke_test) if __name__ == "__main__": -- GitLab From cba1b5dba2e44a717a4338e8e409eeab00cca60f Mon Sep 17 00:00:00 2001 From: Ryan Roberts Date: Tue, 20 Dec 2022 15:41:30 +0000 Subject: [PATCH 2/2] config: Update to latest tagged component versions We prefer to default to a tagged component version rather than tracking the tip of a branch, since this minimizes chances of hitting stability issues (users that want to follow a branch can override it themselves). However this means we need to periodically up-rev all components and test that they continue to work. All tests have passed with these new versions. Signed-off-by: Ryan Roberts --- config/dt-base.yaml | 2 +- config/edk2-base.yaml | 6 +++--- config/hafnium-base.yaml | 2 +- config/linux-base.yaml | 2 +- config/tfa-base.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/dt-base.yaml b/config/dt-base.yaml index 77ed1a0..2ba5814 100644 --- a/config/dt-base.yaml +++ b/config/dt-base.yaml @@ -15,7 +15,7 @@ build: dt: repo: remote: git://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git - revision: v6.0-dts + revision: v6.1-dts toolchain: aarch64-none-elf- diff --git a/config/edk2-base.yaml b/config/edk2-base.yaml index 2314284..daf779a 100644 --- a/config/edk2-base.yaml +++ b/config/edk2-base.yaml @@ -13,13 +13,13 @@ build: repo: edk2: remote: https://github.com/tianocore/edk2.git - revision: edk2-stable202208 + revision: edk2-stable202211 edk2-platforms: remote: https://github.com/tianocore/edk2-platforms.git - revision: ad00518399fc624688d434321693439062c39bde + revision: 20e07099d8f11889d101dd710ca85001be20e179 acpica: remote: https://github.com/acpica/acpica.git - revision: R03_31_22 + revision: R10_20_22 toolchain: aarch64-none-elf- diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml index d103232..0c750fa 100644 --- a/config/hafnium-base.yaml +++ b/config/hafnium-base.yaml @@ -10,7 +10,7 @@ build: hafnium: repo: remote: https://git.trustedfirmware.org/hafnium/hafnium.git - revision: v2.7 + revision: v2.8 toolchain: aarch64-none-elf- diff --git a/config/linux-base.yaml b/config/linux-base.yaml index f83613a..bb31dad 100644 --- a/config/linux-base.yaml +++ b/config/linux-base.yaml @@ -16,7 +16,7 @@ build: linux: repo: remote: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git - revision: v6.0 + revision: v6.1 toolchain: aarch64-none-elf- diff --git a/config/tfa-base.yaml b/config/tfa-base.yaml index e96b231..8083ca0 100644 --- a/config/tfa-base.yaml +++ b/config/tfa-base.yaml @@ -11,7 +11,7 @@ build: tfa: repo: remote: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git - revision: v2.7.0 + revision: v2.8.0 toolchain: aarch64-none-elf- -- GitLab