Merge pull request #1017 from NikitaSkrynnik/fix-calico

Update `kind` version in calico suite and skip Istio test
networkservicemesh · Jun 2, 2024 · 8e0211c · 8e0211c
2 parents c406bbb + b550068
commit 8e0211c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -214,7 +214,7 @@ jobs:
       - uses: helm/kind-action@v1
         with:
           config: src/github.com/${{ github.repository }}/cluster-config-calico.yaml
-          version: v0.11.1
+          version: v0.23.0
           node_image: kindest/node:${{ env.KUBERNETES_VERSION }}
           wait: 0s
       - name: Setup external CNI plugin

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/networkservicemesh/integration-k8s-kind
 go 1.20
 
 require (
-	github.com/networkservicemesh/integration-tests v0.0.0-20240419110125-2e600279f768
+	github.com/networkservicemesh/integration-tests v0.0.0-20240601085321-28980914496a
 	github.com/stretchr/testify v1.8.4
 )
 

diff --git a/go.sum b/go.sum
@@ -14,8 +14,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc h1:1L/OisEFsOyhwaqeJpYmM1nlJ2dBusUMiszPDBlUip0=
 github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc/go.mod h1:8EWnekTRNX+NxBdTFE24WqUoM7SgJHbiafDBrIIdOmQ=
-github.com/networkservicemesh/integration-tests v0.0.0-20240419110125-2e600279f768 h1:v+EkhzHrEGVKkoSGlBOKawjjxuyXyhdm50MYGXmlHKw=
-github.com/networkservicemesh/integration-tests v0.0.0-20240419110125-2e600279f768/go.mod h1:cT5l2gQd8TEjjgoxLEEF9oR2DB4AH/KlLQEeNvba4U4=
+github.com/networkservicemesh/integration-tests v0.0.0-20240601085321-28980914496a h1:dHLVm3UrqeZ7+lAxXCojJCIXefWflbWVF55fipD+vFc=
+github.com/networkservicemesh/integration-tests v0.0.0-20240601085321-28980914496a/go.mod h1:cT5l2gQd8TEjjgoxLEEF9oR2DB4AH/KlLQEeNvba4U4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

diff --git a/tests_interdomain/interdomain_test.go b/tests_interdomain/interdomain_test.go
@@ -50,6 +50,16 @@ func TestRunInterdomainHealSuite(t *testing.T) {
 	suite.Run(t, new(heal.Suite))
 }
 
+type msmSuite struct {
+	multiservicemesh.Suite
+}
+
+func (s *msmSuite) BeforeTest(suiteName, testName string) {
+	if testName == "TestNsm_istio" {
+		s.T().Skip()
+	}
+}
+
 func TestRunMultiServiceMeshSuite(t *testing.T) {
-	suite.Run(t, new(multiservicemesh.Suite))
+	suite.Run(t, new(msmSuite))
 }