[opte, deps] better support for unpublished xde via tools/opte_version_override#10384
Merged
Conversation
…ride OPTE has both a userland (oxide-vpc, opte-ioctl) pinned in Cargo.toml and a kernel module (xde) installed via the helios pkg repo. When the two need to be tested in lockstep before xde lands in a helios build, the existing override logic did not capture all requirements and swapping in an unpublished build was not seamless, particularly on CI. This builds out the override mechanism around the existing `tools/opte_version_override` stub. Includes: - install_opte.sh, deploy.sh, and releng image builds source `tools/opte_version_override` and, when OPTE_COMMIT is set, install from the buildomat-published p5p (or curl + rem_drv/add_drv on the deploy ramdisk, which has no pkg(5)) instead of the helios pkg repo. - package.sh tarballs `tools/opte_version_override` so that downstream jobs read the same value. - check-opte-ver.yml adds a check-opte-override job that fails any PR targeting main with a non-empty OPTE_COMMIT, so the override can't accidentally leak on main. - ci_check_opte_ver.sh now enforces OPTE_COMMIT == Cargo dependency rev so kernel/userland ABI drift surfaces at PR time. The default is OPTE_COMMIT="", which doesn't apply this override logic. We also fix a stale "expected lab-opte-0.$API_VER" error message in ci_check_opte_ver.sh. The check itself uses "lab-2.0-opte-0.$API_VER". This work was extracted from multicast work that (at times) has needed an unpublished xde for kernel-side multicast integration(s).
zeeshanlakhani
changed the title
zeeshanlakhani
force-pushed
the
zl/opte-version-override
branch
from
4caf5dc to
9c02919
Compare
FelixMcFelix
approved these changes
May 18, 2026
Contributor
FelixMcFelix
left a comment
FelixMcFelix
left a comment
There was a problem hiding this comment.
Glad to see this pulled out of #10070. Just a few nits from me.
| # swap them in. The deploy target is a ramdisk image without pkg(5), so we | ||
| # use rem_drv/add_drv instead of the p5p approach used by install_opte.sh | ||
| # and releng. | ||
| # shellcheck source=/dev/null |
Contributor
There was a problem hiding this comment.
Nit: vestigial shellcheck?
Includes: - deploy.sh: drop vestigial `shellcheck source=/dev/null` directive - releng: update `download_opte_p5p` to take refes and clone internally
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.
OPTE has both a userland (oxide-vpc, opte-ioctl) pinned in Cargo.toml and a kernel module (xde) installed via the helios pkg repo. When the two need to be tested in lockstep before xde lands in a helios build, the existing override logic did not capture all requirements and swapping in an unpublished build was not seamless, particularly on CI. This builds out the override mechanism around the existing
tools/opte_version_overridestub.Includes:
tools/opte_version_overrideand, when OPTE_COMMIT is set, install from the buildomat-published p5p (or curl + rem_drv/add_drv on the deploy ramdisk, which has no pkg(5)) instead of the helios pkg repo.tools/opte_version_overrideso that downstream jobs read the same value.The default is OPTE_COMMIT="", which doesn't apply this override logic.
We also fix a stale "expected lab-opte-0.$API_VER" error message in ci_check_opte_ver.sh. The check itself uses "lab-2.0-opte-0.$API_VER".
This work was extracted from multicast work that (at times) has needed an unpublished xde for kernel-side multicast integration(s).