github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4364 from AkihiroSuda/ci-v1-v2-clarity

Browse Source 
CI: {v1, v2} -> io.containerd.runc.{v1,v2}
This commit is contained in:
Phil Estes 2020-07-08 08:49:04 -04:00 committed by GitHub
commit 4f979f0655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@ -258,7 +258,7 @@ jobs:
strategy: strategy:
matrix: matrix:
runtime: [v1] runtime: [io.containerd.runc.v1]
steps: steps:
- name: Install Go - name: Install Go
@ -324,10 +324,10 @@ jobs:
strategy: strategy:
matrix: matrix:
runtime: [v1, v2] runtime: [io.containerd.runc.v1, io.containerd.runc.v2]
runc: [runc, crun] runc: [runc, crun]
exclude: exclude:
- runtime: v1 - runtime: io.containerd.runc.v1
runc: crun runc: crun
steps: steps:
@ -395,7 +395,7 @@ jobs:
- name: Integration 1 - name: Integration 1
env: env:
GOPROXY: direct GOPROXY: direct
TEST_RUNTIME: io.containerd.runc.${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
RUNC_FLAVOR: ${{ matrix.runc }} RUNC_FLAVOR: ${{ matrix.runc }}
run: | run: |
sudo GOPATH=$GOPATH GOPROXY=$GOPROXY TEST_RUNTIME=$TEST_RUNTIME RUNC_FLAVOR=$RUNC_FLAVOR make integration EXTRA_TESTFLAGS=-no-criu TESTFLAGS_RACE=-race sudo GOPATH=$GOPATH GOPROXY=$GOPROXY TEST_RUNTIME=$TEST_RUNTIME RUNC_FLAVOR=$RUNC_FLAVOR make integration EXTRA_TESTFLAGS=-no-criu TESTFLAGS_RACE=-race
@ -405,7 +405,7 @@ jobs:
- name: Integration 2 - name: Integration 2
env: env:
GOPROXY: direct GOPROXY: direct
TEST_RUNTIME: io.containerd.runc.${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
RUNC_FLAVOR: ${{ matrix.runc }} RUNC_FLAVOR: ${{ matrix.runc }}
run: | run: |
sudo GOPATH=$GOPATH GOPROXY=$GOPROXY TEST_RUNTIME=$TEST_RUNTIME RUNC_FLAVOR=$RUNC_FLAVOR TESTFLAGS_PARALLEL=1 make integration EXTRA_TESTFLAGS=-no-criu sudo GOPATH=$GOPATH GOPROXY=$GOPROXY TEST_RUNTIME=$TEST_RUNTIME RUNC_FLAVOR=$RUNC_FLAVOR TESTFLAGS_PARALLEL=1 make integration EXTRA_TESTFLAGS=-no-criu
@ -413,7 +413,7 @@ jobs:
- name: CRI test - name: CRI test
env: env:
TEST_RUNTIME: io.containerd.runc.${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
run: | run: |
sudo mkdir -p /etc/containerd sudo mkdir -p /etc/containerd
sudo bash -c "cat > /etc/containerd/config.toml <<EOF sudo bash -c "cat > /etc/containerd/config.toml <<EOF