Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ondatra #417

Merged
merged 3 commits into from
Aug 17, 2023
Merged

Upgrade ondatra #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
432457b
Upgrade ondatra
alexmasi Aug 16, 2023
b905e8e
one version newer
alexmasi Aug 17, 2023
1b94ffa
update vendor test
alexmasi Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cloudbuild/presubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ steps:
- USERNAME=user
- SSH_ARGS=--internal-ip --ssh-key-expire-after=1d
- INSTANCE_NAME=kne-presubmit-kne-$BUILD_ID
- INSTANCE_ARGS=--network cloudbuild-workers --image-project gep-kne --image-family kne --machine-type e2-standard-4 --boot-disk-size 200GB --preemptible
- INSTANCE_ARGS=--network cloudbuild-workers --image-project gep-kne --image-family kne --machine-type e2-standard-4 --boot-disk-size 200GB
- ZONE=us-central1-a
- REMOTE_WORKSPACE=/tmp/workspace
- COMMAND=source /tmp/workspace/cloudbuild/kne_test.sh 2>&1
Expand All @@ -17,12 +17,12 @@ steps:
- USERNAME=user
- SSH_ARGS=--internal-ip --ssh-key-expire-after=1d
- INSTANCE_NAME=kne-presubmit-vendors-$BUILD_ID
- INSTANCE_ARGS=--network cloudbuild-workers --image-project gep-kne --image-family kne --machine-type n2-standard-16 --boot-disk-size 200GB --enable-nested-virtualization --preemptible
- INSTANCE_ARGS=--network cloudbuild-workers --image-project gep-kne --image-family kne --machine-type n2-standard-16 --boot-disk-size 200GB --enable-nested-virtualization
- ZONE=us-central1-a
- REMOTE_WORKSPACE=/tmp/workspace
- COMMAND=source /tmp/workspace/cloudbuild/vendors_test.sh 2>&1

timeout: 1800s
timeout: 2700s

options:
pool:
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/vendors/vendors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func TestSRL(t *testing.T) {
dut := ondatra.DUT(t, "srl")
testGNMI(t, dut)
testGRIBI(t, dut)
testGNOI(t, dut)
// testGNOI(t, dut)
testP4RT(t, dut)
}

Expand Down
40 changes: 22 additions & 18 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ require (
github.com/aristanetworks/arista-ceoslab-operator/v2 v2.0.1
github.com/docker/docker v20.10.24+incompatible
github.com/ghodss/yaml v1.0.0
github.com/golang/glog v1.0.0
github.com/golang/glog v1.1.0
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.9
github.com/h-fam/errdiff v1.0.2
github.com/kr/pretty v0.3.0
github.com/kr/pretty v0.3.1
github.com/networkop/meshnet-cni v0.3.1-0.20230525201116-d7c306c635cf
github.com/open-traffic-generator/ixia-c-operator v0.3.4
github.com/openconfig/gnmi v0.9.1
github.com/openconfig/gnmi v0.10.0
github.com/openconfig/gribi v1.0.0
github.com/openconfig/lemming/operator v0.2.0
github.com/openconfig/ondatra v0.1.14
github.com/openconfig/ondatra v0.2.7
github.com/p4lang/p4runtime v1.3.0
github.com/pborman/uuid v1.2.1
github.com/pkg/errors v0.9.1
github.com/scrapli/scrapligo v1.1.11
github.com/scrapli/scrapligocfg v1.0.0
github.com/spf13/cobra v1.6.1
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.15.0
github.com/srl-labs/srl-controller v0.6.0
github.com/srl-labs/srlinux-scrapli v0.6.0
go.universe.tf/metallb v0.13.5
golang.org/x/oauth2 v0.6.0
golang.org/x/oauth2 v0.7.0
google.golang.org/api v0.114.0
google.golang.org/grpc v1.54.0
google.golang.org/protobuf v1.30.0
google.golang.org/grpc v1.58.0-dev
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
Expand All @@ -45,7 +45,7 @@ require (

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.0 // indirect
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
Expand Down Expand Up @@ -95,36 +95,40 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-traffic-generator/snappi/gosnappi v0.11.14 // indirect
github.com/openconfig/gnoi v0.0.0-20230221223856-1727ed932554 // indirect
github.com/openconfig/gnsi v1.2.1 // indirect
github.com/openconfig/gocloser v0.0.0-20220310182203-c6c950ed3b0b // indirect
github.com/openconfig/goyang v1.2.0 // indirect
github.com/openconfig/ygnmi v0.7.6 // indirect
github.com/openconfig/ygot v0.27.0 // indirect
github.com/openconfig/goyang v1.4.0 // indirect
github.com/openconfig/ygnmi v0.8.7 // indirect
github.com/openconfig/ygot v0.29.9 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.6.1 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/sirikothe/gotextfsm v1.0.1-0.20200816110946-6aa2cfd355e4 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading