Merge pull request #104 from mxpv/ci

Update integration tests on CI
This commit is contained in:
Fu Wei 2023-03-13 00:27:11 +00:00 committed by GitHub
commit 70d0845ba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions

View File

@ -88,12 +88,12 @@ jobs:
integration: integration:
name: Integration name: Integration
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
timeout-minutes: 30 timeout-minutes: 40
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest] os: [ubuntu-20.04]
containerd: [v1.5.13, v1.6.8] containerd: [v1.6.19, v1.7.0]
steps: steps:
- name: Checkout extensions - name: Checkout extensions
@ -101,14 +101,7 @@ jobs:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: '1.17.5' go-version: '1.20'
# This step is required for containerd v1.5.x and below
- name: Setup GOPATH
shell: bash
run: |
echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
- name: Checkout containerd - name: Checkout containerd
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -128,7 +121,7 @@ jobs:
sudo -E PATH=$PATH script/setup/install-runc sudo -E PATH=$PATH script/setup/install-runc
sudo -E PATH=$PATH script/setup/install-cni $(grep containernetworking/plugins go.mod | awk '{print $2}') sudo -E PATH=$PATH script/setup/install-cni $(grep containernetworking/plugins go.mod | awk '{print $2}')
# Install containerd # Install containerd
make bin/containerd GO_BUILD_FLAGS="-mod=vendor" BUILDTAGS="no_btrfs" make bin/containerd GO_BUILD_FLAGS="-mod=vendor" BUILDTAGS="no_btrfs no_devmapper"
sudo -E PATH=$PATH install bin/containerd /usr/local/bin/ sudo -E PATH=$PATH install bin/containerd /usr/local/bin/
working-directory: src/github.com/containerd/containerd working-directory: src/github.com/containerd/containerd
@ -141,7 +134,10 @@ jobs:
env: env:
GOPROXY: direct GOPROXY: direct
TEST_RUNTIME: "io.containerd.runc.v2-rs" TEST_RUNTIME: "io.containerd.runc.v2-rs"
run: sudo -E PATH=$PATH TESTFLAGS_PARALLEL=1 make integration TESTFLAGS_RACE=-race EXTRA_TESTFLAGS=-no-criu TESTFLAGS_PARALLEL: 1
EXTRA_TESTFLAGS: "-no-criu -test.skip='(TestContainerPTY|TestContainerExecLargeOutputWithTTY|TestTaskUpdate|TestTaskResize)'"
TESTFLAGS_RACE: "-race"
run: sudo -E PATH=$PATH make integration
working-directory: src/github.com/containerd/containerd working-directory: src/github.com/containerd/containerd
- name: Install async shim - name: Install async shim
@ -153,5 +149,8 @@ jobs:
env: env:
GOPROXY: direct GOPROXY: direct
TEST_RUNTIME: "io.containerd.runc.v2-rs" TEST_RUNTIME: "io.containerd.runc.v2-rs"
run: sudo -E PATH=$PATH TESTFLAGS_PARALLEL=1 make integration TESTFLAGS_RACE=-race EXTRA_TESTFLAGS=-no-criu TESTFLAGS_PARALLEL: 1
EXTRA_TESTFLAGS: "-no-criu -test.skip='(TestContainerPTY|TestContainerExecLargeOutputWithTTY|TestTaskUpdate|TestTaskResize)'"
TESTFLAGS_RACE: "-race"
run: sudo -E PATH=$PATH make integration
working-directory: src/github.com/containerd/containerd working-directory: src/github.com/containerd/containerd