Pull Requests (PRs) submitted to the Unikraft core or to any official Unikraft micro-library repositories on Github will go through a rigorous code review process before they are accepted and merged. This is done to ensure the following goals are met:
checkpatch.uk
.
This program was derived from the Linux kernel.This process can take some time but it ensures the stability and integrity of Unikraft. More often than not, PRs must either be rebased, updated or undergo some change before they are merged. This is normal and ensures fixes, new features and anything else introduced into Unikraft ecosystem meet the goals listed above. This is more likely to occur with new features which will often go through multiple rounds or versions with a maintainer or "sheppard". If you are a first-time contributor, please do not be discouraged by this lengthy process or additional feedback. This is mentioned now to prevent any suprises regarding the review-process. Feedback is provided in good spirit, and often-times allows for all parties to be properly informed with the best solution to a given problem.
On this page, we detail how the process of a review of a PR occurs for both those who wish to make new contributions to the core, or any additional micro-library component, as well as those who conduct the reviews themselves.
Reviewers, before you start a review, please:
- Be polite, considerate, and helpful.
- Comment on positive aspects of PRs as well as changes.
- Be empathetic and mindful of how your review may be received.
- Assume good intent and ask clarifying questions.
- Experienced reviewers, consider pairing with new reviewers whose work requires extensive changes.
After a new PR is submitted, the first thing to occur are a number of automatic checks and new builds of the branch-to-be-merged from Unikraft's CI/CD system. One of the first operations to occur is autolabelling.
The operation to occur is the auto-assignment of a reviewer and maintainer (or "sheppard") to the PR.
Both the reviewer and the assignee (a.k.a. maintainer) are derived automatically based on their workload (i.e. the number of other reviews they have to do) and their affiliation with a Special Interest Group which oversees the area of change the PR affects.
checkpatch.uk
program against the PR's branch applied on top of the staging
the repository in question to ensure each commit meets relevant style, consistency and validity requirements.If the checkpatch has at all failed, the comment from unikraft-bot will provide a truncated summary.
In this case, the PR must be rebased with changes which meet the requirements of the checkpatch.
For new contributors, please run the checkpatch.uk
program before creating the PR to streamline the review process.
A reviewer will typically request for a rebase with the recommendations from the checkpatch before continuing with their review.
checkpatch.uk
, a number of consistency builds are run in parallel for known architectures and platforms against the helloworld Unikraft application with the branch of the PR.
These checks will appear at the bottom of the PR, like so:At this point it is up to the reviewer to comb through the requested change to the repository.
This can be, for example, accomplished by testing the changes locally with kraft
and by checking out the PR using the Github CLI in the relevant directory of a fresh clone of related Unikraft repositories at the staging
branch:
If the PR is a change to the Unikraft core repository, then you can simply update the branch of the local clone from the initialization step detailed above:
$ cd /tmp/unikraft-pr-$PR_ID/.unikraft/unikraft$ gh pr checkout $PR_ID
If the change is to a separate micro-library component, please clone the relevant library or initialize the relevant application.
Once the PR's code has been applied on top of the staging
branch of the relevant repository, proceed by configuring the unikernel with appropriate build options, compiling and then running.
Detailed comments, general feedback, request for changes or approvals of the PR are done via Github's PR review manager. Generally you can press the "Files changed" tab of a PR which reveals a diff where you can use to start your review. On this page, you can leave in-line comments.
On receiving feedback and changes#
When a PR has had changes requested to it, it is important that the changes are made as part of a rebase and then force pushing to the original branch. Simply applying the changes ontop of the previous commits is not sufficient. If a force push or changes to the branch will re-trigger the review process (see 1, 2 and 3).
A reviewer of a PR should generally check the following items with regard to the PR in question:
The review may go through a back-and-forth between the authors and the reviewer before the reviewer marks the PR as approved. As a reviewer, when you consider the process complete you must add an equivilant "sign off" in the same way that the author has. This is done by adding a "Reviewed-by" Git trailer like so:
Reviewed-by: Your Name <[email protected]>
To do this, you can navigate to the "Files changed" tab of a PR which reveals a diff and access the review box. Then simply select one of the available requests and add along with your comments the trailer.
Adding a Reviewed-by
tag is important to the CI/CD system, as it signals that a review has been completed which is the first lock of the merge process.
The approval process of a PR is the final step before a PR is merged and is performed by a maintainer or sheppard. Maintainers are also auto assigned by unikraft-bot and will check both the PR and the review to ensure consistency with the goals mentioned above as well as this very review process.
Much like providing a review to a PR, an approval must be made when the PR is absolutely ready to be merged. An approval will unlock the CI/CD system and will automatically merge the PR into the desired repository.
An approval must use Github's review tool and mark the PR as state "approved" this can be done in the same way as the review in the figure above, or alternatively it can be done with GitHub's CLI companion tool like so:
$ gh pr review https://github.com/unikraft/app-nginx/pull/2 \--approve \--body "Approved-by: Your Name <[email protected]>"
The only difference is the trailer, which should be Approved-by
.
Feel free to ask questions, report issues, and meet new people.