calico

Signed-off-by: Artem Glazychev <[email protected]>
networkservicemesh · Jan 26, 2022 · bc1f0f9 · bc1f0f9
1 parent 9e564f6
commit bc1f0f9
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 52 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -71,7 +71,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        calico: ["off", "on"]
+        calico: ["on"]
     steps:
       - name: Set up /bin permissions   # 1. Set up /bin permissions
         run: |
@@ -82,8 +82,8 @@ jobs:
           go-version: 1.16
       - name: Install cloudtest         # 3. Install cloudtest
         run: |
-          go get github.com/networkservicemesh/cloudtest@master
-#          GOPROXY=direct go get github.com/Mixaster995/cloudtest@no-cleanup
+#          go get github.com/networkservicemesh/cloudtest@master
+          GOPROXY=direct go get github.com/Mixaster995/cloudtest@no-cleanup
         env:
           GO111MODULE: on
           GOBIN: /bin
@@ -142,10 +142,10 @@ jobs:
       - uses: actions/setup-go@v1
         with:
           go-version: 1.16
-      - name: Clean up packet
-        run: |
-          go get github.com/networkservicemesh/cloudtest/pkg/providers/packet/packet_cleanup@master
-          packet_cleanup -k y -c y
+#      - name: Clean up packet
+#        run: |
+#          go get github.com/networkservicemesh/cloudtest/pkg/providers/packet/packet_cleanup@master
+#          packet_cleanup -k y -c y
         env:
           GO111MODULE: on
           GOBIN: /bin

diff --git a/cloudtest/packet.yaml b/cloudtest/packet.yaml
@@ -11,7 +11,7 @@ providers:
     env:
       - CLUSTER_RULES_PREFIX=null  # To not add any specific code
       - KUBECONFIG=$(tempdir)/config
-      - CLUSTER_NAME=$(cluster-name)-$(date)-${GITHUB_RUN_NUMBER}-$(rands10)
+      - CLUSTER_NAME=test-$(cluster-name)-$(date)-${GITHUB_RUN_NUMBER}-$(rands10)
     env-check:
       - PACKET_AUTH_TOKEN
       - PACKET_PROJECT_ID

diff --git a/main_test.go b/main_test.go
@@ -17,54 +17,48 @@
 package main_test
 
 import (
+	"github.com/networkservicemesh/integration-tests/suites/basic"
 	"os"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-
-	"github.com/networkservicemesh/integration-tests/suites/calico"
-	"github.com/networkservicemesh/integration-tests/suites/heal"
-	"github.com/networkservicemesh/integration-tests/suites/memory"
-	"github.com/networkservicemesh/integration-tests/suites/multiforwarder"
-	"github.com/networkservicemesh/integration-tests/suites/observability"
-	"github.com/networkservicemesh/integration-tests/suites/sriov"
 )
 
 func isCalico() bool {
 	return os.Getenv("CALICO") == "on"
 }
 
-func TestMemory(t *testing.T) {
-	if isCalico() {
-		t.Skip("not available with Calico")
-	}
-	suite.Run(t, new(memory.Suite))
-}
-
-func TestSRIOV(t *testing.T) {
-	if isCalico() {
-		t.Skip("not available with Calico")
-	}
-	suite.Run(t, new(sriov.Suite))
-}
-
-func TestMultiForwarder(t *testing.T) {
-	if isCalico() {
-		t.Skip("not available with Calico")
-	}
-	suite.Run(t, new(multiforwarder.Suite))
-}
-
-func TestHeal(t *testing.T) {
-	if isCalico() {
-		t.Skip("not available with Calico")
-	}
-	suite.Run(t, new(heal.Suite))
-}
-
-func TestRunObservabilitySuite(t *testing.T) {
-	suite.Run(t, new(observability.Suite))
-}
+//func TestMemory(t *testing.T) {
+//	if isCalico() {
+//		t.Skip("not available with Calico")
+//	}
+//	suite.Run(t, new(memory.Suite))
+//}
+//
+//func TestSRIOV(t *testing.T) {
+//	if isCalico() {
+//		t.Skip("not available with Calico")
+//	}
+//	suite.Run(t, new(sriov.Suite))
+//}
+//
+//func TestMultiForwarder(t *testing.T) {
+//	if isCalico() {
+//		t.Skip("not available with Calico")
+//	}
+//	suite.Run(t, new(multiforwarder.Suite))
+//}
+//
+//func TestHeal(t *testing.T) {
+//	if isCalico() {
+//		t.Skip("not available with Calico")
+//	}
+//	suite.Run(t, new(heal.Suite))
+//}
+//
+//func TestRunObservabilitySuite(t *testing.T) {
+//	suite.Run(t, new(observability.Suite))
+//}
 
 func TestBasic(t *testing.T) {
 	if isCalico() {
@@ -73,9 +67,9 @@ func TestBasic(t *testing.T) {
 	suite.Run(t, new(basic.Suite))
 }
 
-func TestCalico(t *testing.T) {
-	if !isCalico() {
-		t.Skip("not available without Calico")
-	}
-	suite.Run(t, new(calico.Suite))
-}
+//func TestCalico(t *testing.T) {
+//	if !isCalico() {
+//		t.Skip("not available without Calico")
+//	}
+//	suite.Run(t, new(calico.Suite))
+//}