summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShelley-BaoYue <baoyue2@huawei.com>2023-08-28 14:56:57 +0800
committerfisherxu <xufei40@huawei.com>2023-08-31 14:24:21 +0800
commit61b945d0158056bd58e0ddf4670dadb1f8e66f9c (patch)
tree0f5f44eedfda30286610007341f833bcc9260f34
parentMerge pull request #4937 from WillardHu/automated-cherry-pick-of-#4834-upstre... (diff)
downloadkubeedge-61b945d0158056bd58e0ddf4670dadb1f8e66f9c.tar.gz
enable cri config in containerd
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
-rw-r--r--.github/workflows/main.yaml15
1 files changed, 15 insertions, 0 deletions
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index f6980f37d..04fd2f6bc 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -153,6 +153,9 @@ jobs:
fail_ci_if_error: true
verbose: true
+ - name: enable cri config in containerd service
+ run: |
+ containerd config default | sudo tee /etc/containerd/config.toml && sudo systemctl restart containerd.service
- run: make integrationtest
@@ -200,6 +203,10 @@ jobs:
run: |
docker load < /home/runner/build-tools/build-tools.tar
+ - name: enable cri config in containerd service
+ run: |
+ containerd config default | sudo tee /etc/containerd/config.toml && sudo systemctl restart containerd.service
+
# for QUIC protocol, we will use docker as edgecore container runtime
# for WebSocket protocol, we will use containerd as edgecore container runtime
# just for covering both docker and CRI runtime e2e cases
@@ -255,6 +262,10 @@ jobs:
run: |
docker load < /home/runner/build-tools/build-tools.tar
+ - name: enable cri config in containerd service
+ run: |
+ containerd config default | sudo tee /etc/containerd/config.toml && sudo systemctl restart containerd.service
+
- run: make keadm_deprecated_e2e
keadm_e2e_test:
@@ -290,6 +301,10 @@ jobs:
with:
version: v3.4.0
+ - name: enable cri config in containerd service
+ run: |
+ containerd config default | sudo tee /etc/containerd/config.toml && sudo systemctl restart containerd.service
+
- run: make keadm_e2e
docker_build: