Skip to content

Commit a55083e

Browse files
author
Dongsu Park
committed
docs: Address review comments
Address review comments written by @wking. * Add a blank line between non-manpage refs and manpage refs. * Add backticks for `git status`. * Append a punctuation mark to each list item. * Use `pull request` instead of `PR`. * Specify `console` format to the example commands * Use relative links instead of static URIs * Remove a trailing blank * Remove trailing whitespaces * Run with sudo whenever it's possible * Use correct relative links * Move sections for running runtime validation one level up to the section `Running the runtime validation suite`. * Use `command -v` instead of `which`. * Elaborate why we should specify the TAP variable. Signed-off-by: Dongsu Park <[email protected]>
1 parent ea0a3b2 commit a55083e

File tree

3 files changed

+55
-53
lines changed

3 files changed

+55
-53
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ Use the [runtime validation suite](doc/runtime-compliance-testing.md).
3636
[config.json]: https://github.com/opencontainers/runtime-spec/blob/master/config.md
3737
[runC]: https://github.com/opencontainers/runc
3838
[runtime-spec]: https://github.com/opencontainers/runtime-spec
39+
3940
[generate.1]: man/oci-runtime-tool-generate.1.md
4041
[validate.1]: man/oci-runtime-tool-validate.1.md

docs/devel/release.md

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,56 @@ The following example assumes we're going from version 0.5.0 (`v0.5.0`) to 0.6.0
88
Let's get started:
99

1010
- Start at the relevant milestone on GitHub (e.g. https://github.com/opencontainers/runtime-tools/milestones/v0.6.0): ensure all referenced issues are closed (or moved elsewhere, if they're not done). Close the milestone.
11-
- runtime-tools does not use a [roadmap file](https://github.com/opencontainers/runtime-tools/issues/465) but GitHub milestones. Update the [other milestones](https://github.com/opencontainers/runtime-tools/milestones), if necessary
12-
- Branch from the latest master, make sure your git status is clean
13-
- Update the [VERSION](https://github.com/opencontainers/runtime-tools/blob/master/VERSION)
11+
- runtime-tools does not use a [roadmap file](https://github.com/opencontainers/runtime-tools/issues/465) but GitHub milestones. Update the [other milestones](https://github.com/opencontainers/runtime-tools/milestones), if necessary.
12+
- Branch from the latest master, make sure your `git status` is clean.
13+
- Update the [VERSION](https://github.com/opencontainers/runtime-tools/blob/master/VERSION).
1414
- Update the [release notes][changelog].
1515
Try to capture most of the salient changes since the last release, but don't go into unnecessary detail (better to link/reference the documentation wherever possible).
1616

1717
Ensure the branch is correct:
1818

1919
- Ensure the build is clean!
20-
- `git clean -ffdx && make && make test` should work
21-
- Integration tests on CI should be green
20+
- `git clean -ffdx && make && make test` should work.
21+
- Integration tests on CI should be green.
2222
- Check the version of the binaries:
23-
- Check `./oci-runtime-tool --version`
24-
- Check `./runtimetest --version`
23+
- Check `./oci-runtime-tool --version`.
24+
- Check `./runtimetest --version`.
2525

2626
Once everything is fine:
2727

28-
- File a PR
29-
- Ensure the CI on the release PR is green
28+
- File a pull request.
29+
- Ensure the CI on the release PR is green.
3030
- Send an email to the [mailing list][mailinglist] ([example for v0.5.0](https://groups.google.com/a/opencontainers.org/forum/#!topic/dev/iuWpWUai4_I)) and get reviews from other [maintainers][maintainers].
31-
- Once the maintainers agree, merge the PR
31+
- Once the maintainers agree, merge the PR.
3232

3333
Sign a tagged release and push it to GitHub:
3434

35-
- Add a signed tag: `git tag -s v0.6.0 -m "release v0.6.0"`
36-
- Push the tag to GitHub: `git push origin v0.6.0`
35+
- Add a signed tag: `git tag -s v0.6.0 -m "release v0.6.0"`.
36+
- Push the tag to GitHub: `git push origin v0.6.0`.
3737

3838
Now we switch to the GitHub web UI to conduct the release:
3939

40-
- Start a [new release][gh-new-release] on Github
41-
- Tag "v0.6.0", release title "v0.6.0"
42-
- Copy-paste the release notes you added earlier in [CHANGELOG.md][changelog]
40+
- Start a [new release][gh-new-release] on Github.
41+
- Tag "v0.6.0", release title "v0.6.0".
42+
- Copy-paste the release notes you added earlier in [CHANGELOG.md][changelog].
4343
- Attach the release.
4444
This is a simple tarball:
4545

46-
```
47-
export VER="1.2.0"
48-
export NAME="runtime-tools-v$VER"
49-
mkdir -p $NAME/validation
50-
cp oci-runtime-tool $NAME/
51-
cp validation/*.t $NAME/validation/
52-
sudo chown -R root:root $NAME/
53-
tar czvf $NAME.tar.gz --numeric-owner $NAME/
46+
```console
47+
$ export VER="1.2.0"
48+
$ export NAME="runtime-tools-v$VER"
49+
$ mkdir -p $NAME/validation
50+
$ cp oci-runtime-tool $NAME/
51+
$ cp validation/*.t $NAME/validation/
52+
$ sudo chown -R root:root $NAME/
53+
$ tar czvf $NAME.tar.gz --numeric-owner $NAME/
5454
```
5555

5656
- Publish the release!
5757

5858
- Clean your git tree: `sudo git clean -ffdx`.
5959

60-
[changelog]: https://github.com/opencontainers/runtime-tools/blob/master/CHANGELOG.md
61-
[maintainers]: https://github.com/opencontainers/runtime-tools/blob/master/MAINTAINERS
60+
[changelog]: ../../CHANGELOG.md
61+
[maintainers]: ../../MAINTAINERS
6262
[mailinglist]: https://groups.google.com/a/opencontainers.org/forum/#!forum/dev
6363
[gh-new-release]: https://github.com/opencontainers/runtime-tools/releases/new
64-

docs/runtime-compliance-testing.md

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,15 @@ If your distribution does not package node-tap, you can install [npm][] (for exa
1414
```console
1515
$ npm install tap
1616
```
17-
### From a release
18-
19-
Check if your release has pre-compiled tests on the [release page][releases] page.
20-
21-
```
22-
$ tar xf runtime-tools-v0.6.0.tar.gz
23-
$ RUNTIME=runc tap ./runtime-tools-v0.6.0/validation/*.t
24-
```
25-
26-
### From source
2717

28-
Build the validation executables:
29-
30-
```console
31-
$ make runtimetest validation-executables
32-
```
33-
34-
Runtime validation currently [only supports](docs/runtime-compliance-testing.md) the [OCI Runtime Command Line Interface](doc/command-line-interface.md).
18+
Runtime validation currently [only supports](runtime-compliance-testing.md) the [OCI Runtime Command Line Interface](command-line-interface.md).
3519
If we add support for alternative APIs in the future, runtime validation will gain an option to select the desired runtime API.
36-
For the command line interface, the `RUNTIME` option selects the runtime command (`funC` in the [OCI Runtime Command Line Interface](doc/command-line-interface.md)).
20+
For the command line interface, the `RUNTIME` option selects the runtime command (`funC` in the [OCI Runtime Command Line Interface](command-line-interface.md)).
21+
22+
Note that we should specify the `TAP` variable to the normal user's tap command, because usually the normal user had a newer version of `tap` installed locally via npm, for example, under `$HOME/node_modules/.bin`.
3723

3824
```
39-
$ sudo TAP="$(which tap)" RUNTIME=runc make localvalidation
25+
$ sudo TAP="$(command -v tap)" RUNTIME=runc make localvalidation
4026
RUNTIME=runc /home/alban/.nvm/versions/node/v9.7.1/bin/tap validation/pidfile.t validation/linux_cgroups_memory.t validation/linux_rootfs_propagation_shared.t validation/kill.t validation/linux_readonly_paths.t validation/hostname.t validation/hooks_stdin.t validation/create.t validation/poststart.t validation/linux_cgroups_network.t validation/poststop_fail.t validation/prestart_fail.t validation/linux_cgroups_relative_blkio.t validation/default.t validation/poststop.t validation/linux_seccomp.t validation/prestart.t validation/process_rlimits.t validation/linux_masked_paths.t validation/killsig.t validation/process.t validation/linux_cgroups_relative_pids.t validation/hooks.t validation/linux_rootfs_propagation_unbindable.t validation/linux_cgroups_relative_cpus.t validation/misc_props.t validation/linux_sysctl.t validation/process_oom_score_adj.t validation/linux_devices.t validation/process_capabilities_fail.t validation/start.t validation/linux_cgroups_pids.t validation/process_capabilities.t validation/poststart_fail.t validation/linux_cgroups_relative_hugetlb.t validation/mounts.t validation/linux_cgroups_hugetlb.t validation/linux_cgroups_relative_memory.t validation/state.t validation/root_readonly_true.t validation/linux_cgroups_blkio.t validation/delete.t validation/linux_cgroups_relative_network.t validation/process_rlimits_fail.t validation/linux_cgroups_cpus.t validation/linux_uid_mappings.t
4127
validation/pidfile.t .................................. 1/1 455ms
4228
validation/linux_cgroups_memory.t ..................... 9/9
@@ -101,7 +87,7 @@ validation/linux_seccomp.t ............................ 0/1
10187
not ok validation/linux_seccomp.t
10288
error: >-
10389
Pre-start hooks MUST be called after the `start` operation is called
104-
90+
10591
Refer to:
10692
https://github.com/opencontainers/runtime-spec/blob/v1.0.0/config.md#prestart
10793
@@ -208,10 +194,10 @@ validation/process_capabilities_fail.t .............. 20/27
208194
validation/start.t .....exit status 2
209195
validation/start.t .................................... 6/7
210196
not ok test count !== plan
211-
+++ found
212-
--- wanted
213-
-1
214-
+6
197+
+++ found
198+
--- wanted
199+
-1
200+
+6
215201
results:
216202
ok: false
217203
count: 6
@@ -266,7 +252,7 @@ validation/linux_cgroups_blkio.t .................... 15/15
266252
validation/delete.t ................................... 3/5 22s
267253
not ok attempting to `delete` a container that is not `stopped` MUST generate an error
268254
reference: 'https://github.com/opencontainers/runtime-spec/blob/v1.0.0/runtime.md#delete'
269-
255+
270256
not ok attempting to `delete` a container that is not `stopped` MUST have no effect on the container
271257
error: exit status 1
272258
reference: 'https://github.com/opencontainers/runtime-spec/blob/v1.0.0/runtime.md#delete'
@@ -294,7 +280,7 @@ validation/linux_uid_mappings.t ..................... 20/26
294280
syscall action SCMP_ACT_ALLOW
295281
296282
total ............................................. 420/517
297-
283+
298284
299285
420 passing (1m)
300286
88 pending
@@ -340,7 +326,7 @@ ok 26 - gid mappings
340326
or with the environment variable `VALIDATION_TESTS`:
341327

342328
```console
343-
$ sudo make TAP=$(which tap) RUNTIME=runc VALIDATION_TESTS=validation/default.t localvalidation
329+
$ sudo make TAP=$(command -v tap) RUNTIME=runc VALIDATION_TESTS=validation/default.t localvalidation
344330
RUNTIME=runc /home/alban/.nvm/versions/node/v9.7.1/bin/tap validation/default.t
345331
validation/default.t ................................ 20/26
346332
Skipped: 6
@@ -368,6 +354,22 @@ Files=2, Tests=35, 1 wallclock secs ( 0.03 usr 0.00 sys + 0.12 cusr 0.12 csy
368354
Result: PASS
369355
```
370356

357+
### From a release
358+
359+
Check if your release has pre-compiled tests on the [release page][releases] page.
360+
361+
```console
362+
$ tar xf runtime-tools-v0.6.0.tar.gz
363+
$ sudo RUNTIME=runc tap ./runtime-tools-v0.6.0/validation/*.t
364+
```
365+
366+
### From source
367+
368+
Build the validation executables:
369+
370+
```console
371+
$ make runtimetest validation-executables
372+
```
371373

372374
[compliance]: https://github.com/opencontainers/runtime-spec/blob/v1.0.1/spec.md
373375
[debian-node-tap]: https://packages.debian.org/stretch/node-tap

0 commit comments

Comments
 (0)