Skip to content

Commit 354e52d

Browse files
committed
.github: use ubuntu-22.04 to test cgroupv2
Signed-off-by: Wei Fu <fuweid89@gmail.com>
1 parent cf7417b commit 354e52d

2 files changed

Lines changed: 11 additions & 68 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,16 @@ jobs:
8080
run: ../project/script/validate/fileheader ../project/
8181
working-directory: src/github.com/containerd/cgroups
8282

83-
test-v1:
84-
name: Test cgroups v1
85-
runs-on: ubuntu-18.04
83+
test:
84+
name: Test cgroups
8685
timeout-minutes: 15
8786
needs: [project]
8887

88+
strategy:
89+
matrix:
90+
os: [ubuntu-18.04, ubuntu-22.04]
91+
92+
runs-on: ${{ matrix.os }}
8993
steps:
9094
- name: Install Go
9195
uses: actions/setup-go@v2
@@ -103,23 +107,8 @@ jobs:
103107
with:
104108
path: src/github.com/containerd/cgroups
105109

106-
- name: Run cgroup v1 tests
107-
run: go test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
110+
- name: Run cgroup tests
111+
run: |
112+
sudo -E PATH=$PATH GOPATH=$GOPATH \
113+
$(command -v go) test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
108114
working-directory: src/github.com/containerd/cgroups
109-
110-
test-v2:
111-
name: Test cgroups v2
112-
# nested virtualization is only available on macOS hosts
113-
runs-on: macos-10.15
114-
timeout-minutes: 20
115-
needs: [project]
116-
117-
steps:
118-
- name: Checkout cgroups
119-
uses: actions/checkout@v2
120-
121-
- name: Start vagrant
122-
run: vagrant up
123-
124-
- name: Run cgroups v2 tests
125-
run: vagrant ssh default -- sudo -i /test.sh

Vagrantfile

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)