tests/ci: prepare for integrating into ci.freebsd.org #1815
+84
−82
Conversation
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
|
I'm still reading and thinking. Just a quick response: I think we can drop i386 ( |
lwhsu
reviewed
Aug 21, 2025
tests/ci/Makefile.aarch64
Outdated
| QEMU_MAX_MEM_SIZE=64 | ||
|
|
||
| portinstall-aarch64: portinstall-pkg .PHONY | ||
| .if !exists(/usr/local/share/u-boot/u-boot-qemu-arm64/u-boot.bin) |
There was a problem hiding this comment.
Maybe this part also needs to be guarded by USE_QEMU ?
There was a problem hiding this comment.
Applied the feedback in v2.
|
Moving bhyve bits into Makefile.{aarch64,amd64} seems introducing some code duplication, perhaps the difference part like |
The difference is quite large:
There is not too much code duplication here in the grand scheme of things, and it keeps things simpler by relying on less variable indirection. |
svmhdvn
force-pushed
the
push-rstnsvuzltmw
branch
2 times, most recently
from
affba5b to
01f28ec
Compare
|
Fixed merge conflict in v3. |
svmhdvn
force-pushed
the
push-rstnsvuzltmw
branch
from
01f28ec to
844cb87
Compare
svmhdvn
force-pushed
the
push-rstnsvuzltmw
branch
from
844cb87 to
983ca9f
Compare
svmhdvn
changed the title
svmhdvn
force-pushed
the
push-rstnsvuzltmw
branch
from
983ca9f to
69f09eb
Compare
svmhdvn
force-pushed
the
push-rstnsvuzltmw
branch
from
69f09eb to
1fbb82c
Compare
Currently, since META_DIROUT is created by mktemp(1), it is 0600 by default. This makes it slightly annoying to copy out test-report.* files from a CI run. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
This sets up future work to allow multiple concurrent CI runs, each possibly with their own image file. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
In an upcoming patch, arm64 hosts will default to using bhyve to run CI. However, emulators/qemu-user-static does not exist for arm64, and is not needed when the target is also arm64. This patch ensures that qemu-user-static will only be requested for install if QEMUSTATIC is set. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
This patch removes the ci-set-*-var targets and conditionally runs ci-extract-meta only if CITYPE=full. The intended external interface into the tests/ci Makefile infrastructure already requires CITYPE to be set (either through its default CITYPE?=full line, or through the Make command line). Thus, the ci-set-*-var targets don't functionally do anything. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
Bhyve is only supported on amd64/amd64, amd64/i386, and arm64/arm64. Furthermore, amd64 and arm64 have different command-line arguments and requirements for running bhyve. This patch separates the bhyve version of ci-runtest into architecture-specific Makefiles. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
This change is necessary after commit 4227d51 (release: create pkgbase VM and cloud images) After that commit, pkgbase is expected to be the primary method of installation going forward. Instead of working around this in vmimage.subr with NOPKGBASE, going the pkgbase route helps catch even more test failures. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
This allows us to use ci-runtest on a pre-existing CI disk image. It will be helpful in CI environments (such as ci.freebsd.org) where building and testing are separated into distinct jobs. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
Since its inception, 'make ci' has not found a need for
any arch specific or build-type specific overrides for
building the world and kernel as part of building an image.
This change combines them to avoid multiple invocations
of make, which could cause issues due to differences in
command line between the three targets. This also
simplifies the common and arch-specific Makefiles.
Note that this change still maintains an arch-specific
overridable target ci-buildimage-${TARGET_ARCH} which
can be used if needed.
Signed-off-by: Siva Mahadevan <[email protected]>
Sponsored by: The FreeBSD Foundation
svmhdvn
force-pushed
the
push-rstnsvuzltmw
branch
from
1fbb82c to
4767f1d
Compare
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.
See full commit stack for incremental details and explanations.