Remove legacy CRI from CI

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2023-10-12 09:18:55 -07:00
parent 536abf1b35
commit 2332b9ba10

View File

@ -245,7 +245,6 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [windows-2019, windows-2022] os: [windows-2019, windows-2022]
disable_cri_sandboxes: ["", "legacyCRI"]
defaults: defaults:
run: run:
@ -337,7 +336,6 @@ jobs:
- name: Integration 1 - name: Integration 1
env: env:
CGO_ENABLED: 1 CGO_ENABLED: 1
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-serial-junit.xml GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-serial-junit.xml
GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-serial-gotest.json GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-serial-gotest.json
EXTRA_TESTFLAGS: "-timeout=20m" EXTRA_TESTFLAGS: "-timeout=20m"
@ -355,7 +353,6 @@ jobs:
TESTFLAGS_PARALLEL: 1 TESTFLAGS_PARALLEL: 1
EXTRA_TESTFLAGS: "-short" EXTRA_TESTFLAGS: "-short"
CGO_ENABLED: 1 CGO_ENABLED: 1
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-parallel-junit.xml GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-parallel-junit.xml
GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-parallel-gotest.json GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-parallel-gotest.json
run: mingw32-make.exe integration run: mingw32-make.exe integration
@ -368,14 +365,12 @@ jobs:
- name: CRI Integration Test - name: CRI Integration Test
env: env:
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
TEST_IMAGE_LIST: ${{github.workspace}}/repolist.toml TEST_IMAGE_LIST: ${{github.workspace}}/repolist.toml
run: | run: |
make cri-integration make cri-integration
- name: cri-tools critest - name: cri-tools critest
env: env:
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
CRI_TEST_IMAGES: ${{github.workspace}}/cri-test-images.yaml CRI_TEST_IMAGES: ${{github.workspace}}/cri-test-images.yaml
shell: powershell shell: powershell
run: | run: |
@ -411,7 +406,6 @@ jobs:
runtime: runtime:
- io.containerd.runc.v2 - io.containerd.runc.v2
runc: [runc, crun] runc: [runc, crun]
DISABLE_CRI_SANDBOXES: ["", "legacyCRI"]
env: env:
GOTEST: gotestsum -- GOTEST: gotestsum --
@ -466,7 +460,6 @@ jobs:
env: env:
TEST_RUNTIME: ${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
RUNC_FLAVOR: ${{ matrix.runc }} RUNC_FLAVOR: ${{ matrix.runc }}
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-serial-junit.xml GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-serial-junit.xml
GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-serial-gotest.json GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-serial-gotest.json
run: | run: |
@ -485,7 +478,6 @@ jobs:
env: env:
TEST_RUNTIME: ${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
RUNC_FLAVOR: ${{ matrix.runc }} RUNC_FLAVOR: ${{ matrix.runc }}
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-parallel-junit.xml GOTESTSUM_JUNITFILE: ${{github.workspace}}/test-integration-parallel-junit.xml
GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-parallel-gotest.json GOTESTSUM_JSONFILE: ${{github.workspace}}/test-integration-parallel-gotest.json
run: | run: |
@ -502,14 +494,12 @@ jobs:
- name: CRI Integration Test - name: CRI Integration Test
env: env:
TEST_RUNTIME: ${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
run: | run: |
CONTAINERD_RUNTIME=$TEST_RUNTIME make cri-integration CONTAINERD_RUNTIME=$TEST_RUNTIME make cri-integration
- name: cri-tools critest - name: cri-tools critest
env: env:
TEST_RUNTIME: ${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
DISABLE_CRI_SANDBOXES: ${{ matrix.disable_cri_sandboxes }}
run: | run: |
sudo -E PATH=$PATH ./script/critest.sh "${{github.workspace}}/report" sudo -E PATH=$PATH ./script/critest.sh "${{github.workspace}}/report"