Skip to content

Commit

Permalink
Merge branch 'main' into domainname-test
Browse files Browse the repository at this point in the history
  • Loading branch information
YJDoc2 committed Jan 17, 2024
2 parents 16dedc2 + abb339c commit 4a77505
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/integration_tests_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ jobs:
uses: taiki-e/install-action@just
- name: Install requirements
run: sudo env PATH=$PATH just ci-prepare
- name: Install runc 1.1.0
- name: Install runc 1.1.11
run: |
wget -q https://github.com/opencontainers/runc/releases/download/v1.1.8/runc.amd64
wget -q https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.amd64
sudo mv runc.amd64 /usr/bin/runc
sudo chmod 755 /usr/bin/runc
- name: Build
run: just runtimetest rust-oci-tests-bin
run: just runtimetest contest
- name: Validate tests on runc
run: just validate-rust-oci-runc
run: just validate-contest-runc
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/libcontainer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ v1 = ["libcgroups/v1"]
cgroupsv2_devices = ["libcgroups/cgroupsv2_devices"]

[dependencies]
bitflags = "2.4.1"
bitflags = "2.4.2"
caps = "0.5.5"
chrono = { version = "0.4", default-features = false, features = [
"clock",
Expand Down
4 changes: 2 additions & 2 deletions docs/src/developer/e2e/rust_oci_test.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rust oci tests
# Contest

This is youki's original integration to verify the behavior of the low-level container runtime.

Expand All @@ -7,7 +7,7 @@ This is youki's original integration to verify the behavior of the low-level con
# How to run

```console
just rust-oci-tests
just test-contest
```

# How to write
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test-contest: youki-release contest

# validate rust oci integration tests on runc
validate-contest-runc: contest
{{ cwd }}/scripts/rust_integration_tests.sh runc
{{ cwd }}/scripts/contest.sh runc

# test podman rootless works with youki
test-rootless-podman:
Expand Down

0 comments on commit 4a77505

Please sign in to comment.