From: Simon Glass <simon.glass@canonical.com>
Add CI entries for the new qemu-x86_64_nospl board in both
GitLab and Azure pipelines, along with the corresponding test
hook configuration files.
The test configuration is identical to qemu-x86_64 since both
use the same QEMU binary and u-boot.rom BIOS file.
Co-developed-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---
.azure-pipelines.yml | 3 ++
.gitlab-ci.yml | 6 ++++
.../bin/travis-ci/conf.qemu-x86_64_nospl_na | 30 +++++++++++++++++++
.../u_boot_boardenv_qemu_x86_64_nospl_na.py | 14 +++++++++
4 files changed, 53 insertions(+)
create mode 100644 test/hooks/bin/travis-ci/conf.qemu-x86_64_nospl_na
create mode 100644 test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_64_nospl_na.py
@@ -486,6 +486,9 @@ stages:
qemu_x86_64:
TEST_PY_BD: "qemu-x86_64"
TEST_PY_TEST_SPEC: "not sleep"
+ qemu_x86_64_nospl:
+ TEST_PY_BD: "qemu-x86_64_nospl"
+ TEST_PY_TEST_SPEC: "not sleep"
qemu_xtensa_dc233c:
TEST_PY_BD: "qemu-xtensa-dc233c"
TEST_PY_TEST_SPEC: "not sleep and not efi"
@@ -664,6 +664,12 @@ qemu-x86_64 test.py:
TEST_PY_TEST_SPEC: "not sleep"
<<: *buildman_and_testpy_dfn
+qemu-x86_64_nospl test.py:
+ variables:
+ TEST_PY_BD: "qemu-x86_64_nospl"
+ TEST_PY_TEST_SPEC: "not sleep"
+ <<: *buildman_and_testpy_dfn
+
qemu-xtensa-dc233c test.py:
variables:
TEST_PY_BD: "qemu-xtensa-dc233c"
new file mode 100644
@@ -0,0 +1,30 @@
+# Copyright (c) 2016 Konsulko Group. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+console_impl=qemu
+qemu_machine="pc"
+qemu_binary="qemu-system-x86_64"
+qemu_extra_args="-nographic -cpu qemu64 -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device e1000,netdev=net0 "
+qemu_extra_args+=" -object rng-random,filename=/dev/random,id=rng0"
+qemu_extra_args+=" -device virtio-rng-pci,rng=rng0,max-bytes=1024,period=1000"
+
+qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot.rom"
+reset_impl=none
+flash_impl=none
new file mode 100644
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+import os
+import travis_tftp
+
+env__net_uses_pci = True
+env__net_dhcp_server = True
+env__net_tftp_readable_file = travis_tftp.file2env('u-boot')
+env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi')
+env__efi_loader_check_smbios = True
+env__efi_loader_grub_file = travis_tftp.file2env('grub_x64.efi')
+env__efi_fit_tftp_file = {
+ "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'],
+}