From 134c4a2efeb0bc3a98a61a8075caa51cc34eed4d Mon Sep 17 00:00:00 2001 From: Kirtana Ashok Date: Mon, 18 Sep 2023 15:47:52 -0700 Subject: [PATCH] Cleanup tests that are skipped in CI: Removes TestConvert() from being skipped as corresponding fix made to v1.6.22 Skip TestContainerSymlinkVolumes() tests as it seems to pass only with containerd/1.7 Signed-off-by: Kirtana Ashok --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8df3dc88a6..21031b19bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -382,9 +382,7 @@ jobs: shell: bash working-directory: src/github.com/containerd/containerd run: | - # TODO: when https://github.com/containerd/containerd/pull/8691 makes it into the next release (container v1.6.22?), remove the skip - # `-skip` is only available in go1.20 - export EXTRA_TESTFLAGS='-timeout=20m -run="[^(TestConvert)]"' + export EXTRA_TESTFLAGS='-timeout=20m' export GOTEST='gotestsum --format=standard-verbose --debug --' make integration @@ -410,7 +408,7 @@ jobs: # We skip this test here, until a new release of hcsshim is cut and the one in # containerd is updated. When the shim is updated in containerd, this test will # also need to be updated and the special case for windows, removed. - FOCUS="[^TestContainerdRestart$]" make cri-integration + FOCUS="[^(TestContainerdRestart|TestContainerSymlinkVolumes)]" make cri-integration # Enable these tests once the required JobContainer images are updated. #