Skip to content

Commit

Permalink
test calico suite
Browse files Browse the repository at this point in the history
Signed-off-by: Mikhail Avramenko <[email protected]>
  • Loading branch information
Mixaster995 committed Jan 20, 2022
1 parent 889d2ca commit 3b0772c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .cloudtest.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
version: 1.0
root: "./.tests/cloud_test/"
timeout: 7200 # 2 hour total total timeout
timeout: 10800 # 3 hour total total timeout
shuffle-enabled: true
statistics:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion .cloudtest_calico.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
version: 1.0
root: "./.tests/cloud_test_calico/"
timeout: 7200 # 2 hour total total timeout
timeout: 10800 # 3 hour total total timeout
shuffle-enabled: true
statistics:
enabled: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ jobs:
- name: Install cloudtest # 3. Install cloudtest
run: |
go get github.com/networkservicemesh/cloudtest@master
# GOPROXY=direct go get github.com/Mixaster995/cloudtest@no-cleanup
env:
GO111MODULE: on
GOBIN: /bin
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/networkservicemesh/integration-k8s-packet
module github.com/networkservicemesh/integratiohuhgyn-k8s-packet

go 1.16

require (
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/networkservicemesh/integration-tests v0.0.0-20220118134157-d3e1be7ce81a
github.com/networkservicemesh/integration-tests v0.0.0-20220120091746-3e71046e4a08
github.com/stretchr/testify v1.7.0
gopkg.in/yaml.v2 v2.4.0 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/networkservicemesh/gotestmd v0.0.0-20211116145945-871d2aaf07ab h1:/dIr8Nky77grI3s9Rc78eFH9M1Svobyj2XJBaKm27ts=
github.com/networkservicemesh/gotestmd v0.0.0-20211116145945-871d2aaf07ab/go.mod h1:8EWnekTRNX+NxBdTFE24WqUoM7SgJHbiafDBrIIdOmQ=
github.com/networkservicemesh/integration-tests v0.0.0-20220118134157-d3e1be7ce81a h1:BpCtVcuuc5nGN0ihT3IC6XRVSWLfwwjwBVwHZkH8aX0=
github.com/networkservicemesh/integration-tests v0.0.0-20220118134157-d3e1be7ce81a/go.mod h1:0o7WrzxlHEwnDSuZPEM1BnKd4hr7+akKgymoAoTTbv8=
github.com/networkservicemesh/integration-tests v0.0.0-20220120091746-3e71046e4a08 h1:CSMRodhf4Lz8o52yO3iX/u0bTAJkt3Bje0NG6GH2jAU=
github.com/networkservicemesh/integration-tests v0.0.0-20220120091746-3e71046e4a08/go.mod h1:0o7WrzxlHEwnDSuZPEM1BnKd4hr7+akKgymoAoTTbv8=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down
15 changes: 9 additions & 6 deletions main_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
// Copyright (c) 2020-2022 Doc.ai and/or its affiliates.
//
// SPDX-License-Identifier: Apache-2.0
//
Expand All @@ -22,7 +22,7 @@ import (

"github.com/stretchr/testify/suite"

"github.com/networkservicemesh/integration-tests/suites/basic"
"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"
Expand All @@ -41,6 +41,9 @@ func TestMemory(t *testing.T) {
}

func TestSRIOV(t *testing.T) {
if isCalico() {
t.Skip("not available with Calico")
}
suite.Run(t, new(sriov.Suite))
}

Expand All @@ -58,9 +61,9 @@ func TestHeal(t *testing.T) {
suite.Run(t, new(heal.Suite))
}

func TestBasic(t *testing.T) {
if isCalico() {
t.Skip("not available with Calico")
func TestCalico(t *testing.T) {
if !isCalico() {
t.Skip("not available without Calico")
}
suite.Run(t, new(basic.Suite))
suite.Run(t, new(calico.Suite))
}

0 comments on commit 3b0772c

Please sign in to comment.