summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@gmail.com>2019-04-04 20:39:38 +0900
committerFUJITA Tomonori <fujita.tomonori@gmail.com>2019-04-04 21:33:20 +0900
commit2203e7640b7c5d37555ceb26d08870970cf54708 (patch)
tree9bd4018e382561fa3758756e9f85e90b6a3b4076
parent0ef2ef26aac46845f2a483b4725cbf2c1243cd63 (diff)
test: switch to module from dep completely
Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
-rw-r--r--.travis.yml16
-rw-r--r--Gopkg.lock412
-rw-r--r--Gopkg.toml82
-rw-r--r--test/lib/base.py7
4 files changed, 8 insertions, 509 deletions
diff --git a/.travis.yml b/.travis.yml
index 68c06df4..3b82ff35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,13 @@
language: go
-_dep_ensure: &_dep_ensure
- go: "1.12"
- before_install: go get -u github.com/golang/dep/cmd/dep
- install: $GOPATH/bin/dep ensure
-
_unittest: &_unittest
- <<: *_dep_ensure
+ go: "1.12"
script:
- go test $([ $(go env GOARCH) == 'amd64' ] && echo '-race') $(go list ./... | grep -v '/vendor/') -timeout 120s
- if [ "$(go env GOARCH)" = "amd64" ]; then go test -race github.com/osrg/gobgp/pkg/packet/bgp -run ^Test_RaceCondition$; else echo 'skip'; fi
_build: &_build
- <<: *_dep_ensure
+ go: "1.12"
script:
- go build -o ./cmd/gobgp/gobgp ./cmd/gobgp/
- go build -o ./cmd/gobgpd/gobgpd ./cmd/gobgpd/
@@ -44,6 +39,7 @@ _docker: &_docker
env:
global:
+ - GO111MODULE=on
- DOCKER_IMAGE=gobgp
- FROM_IMAGE=osrg/quagga
@@ -106,7 +102,7 @@ matrix:
#
# Misc
#
- - <<: *_dep_ensure
+ - go: "1.12"
env:
- DESCRIPTION="go fmt + vet + staticcheck"
before_script: go get -u honnef.co/go/tools/cmd/staticcheck
@@ -114,7 +110,7 @@ matrix:
- test -z "$(go fmt $(go list ./... | grep -v '/vendor/'))"
- go vet $(go list ./... | grep -v '/vendor/')
- staticcheck $(go list ./... | grep -v '/vendor/')
- - <<: *_dep_ensure
+ - go: "1.12"
env:
- DESCRIPTION="build_embeded_go.py"
script: python test/scenario_test/ci-scripts/build_embeded_go.py docs/sources/lib.md
@@ -223,8 +219,6 @@ matrix:
cache:
pip: true
-go_import_path: github.com/osrg/gobgp
-
notifications:
slack:
secure: KzuC9kytzS7wTlfj4MqSg8EpqXfJRMbo59dAVTA3w587achnVCS3vhUenWuhMCiWk7+6DVWwNpwzn2+A0S6RwMFMpKAU6Ij6K9sxEOgqBGuMN8w1//w+uJTryzsnebEIhInGt2kKfqz4Wx3QQqW5gVhI+8s+c5M0iXxFtN4soVk=
diff --git a/Gopkg.lock b/Gopkg.lock
deleted file mode 100644
index fcc6cd32..00000000
--- a/Gopkg.lock
+++ /dev/null
@@ -1,412 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
- digest = "1:289dd4d7abfb3ad2b5f728fbe9b1d5c1bf7d265a3eb9ef92869af1f7baba4c7a"
- name = "github.com/BurntSushi/toml"
- packages = ["."]
- pruneopts = ""
- revision = "b26d9c308763d68093482582cea63d69be07a0f0"
- version = "v0.3.0"
-
-[[projects]]
- branch = "master"
- digest = "1:2a1e6af234d7de1ccf4504f397cf7cfa82922ee59b29252e3c34cb38d0b91989"
- name = "github.com/armon/go-radix"
- packages = ["."]
- pruneopts = ""
- revision = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-
-[[projects]]
- branch = "master"
- digest = "1:af4e29ce389815fea4fdc4b44f746321e1d27fbdf03a14f3350d8fdd7e0707ce"
- name = "github.com/coreos/go-systemd"
- packages = ["daemon"]
- pruneopts = ""
- revision = "93d5ec2c7f76e57b4f3cb9fa4ee4e3ea43f3e5c9"
-
-[[projects]]
- digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
- name = "github.com/davecgh/go-spew"
- packages = ["spew"]
- pruneopts = ""
- revision = "346938d642f2ec3594ed81d874461961cd0faa76"
- version = "v1.1.0"
-
-[[projects]]
- branch = "master"
- digest = "1:22b26b7f8e3ca282ca24adc0e5e0c4e68aab26232887eae1020c96a05664a92c"
- name = "github.com/dgryski/go-farm"
- packages = ["."]
- pruneopts = ""
- revision = "ac7624ea8da311f2fbbd94401d8c1cf66089f9fb"
-
-[[projects]]
- digest = "1:ea959741586120518b3d51d0921fd7c789883036444502f5411273dcb2e59e5f"
- name = "github.com/eapache/channels"
- packages = ["."]
- pruneopts = ""
- revision = "47238d5aae8c0fefd518ef2bee46290909cf8263"
- version = "v1.1.0"
-
-[[projects]]
- digest = "1:c05dc14dd75a9697b8410ea13445ceb40669448f789afe955351ad34bc998cd0"
- name = "github.com/eapache/queue"
- packages = ["."]
- pruneopts = ""
- revision = "ded5959c0d4e360646dc9e9908cff48666781367"
- version = "v1.0.2"
-
-[[projects]]
- digest = "1:9f1e571696860f2b4f8a241b43ce91c6085e7aaed849ccca53f590a4dc7b95bd"
- name = "github.com/fsnotify/fsnotify"
- packages = ["."]
- pruneopts = ""
- revision = "629574ca2a5df945712d3079857300b5e4da0236"
- version = "v1.4.2"
-
-[[projects]]
- branch = "master"
- digest = "1:71dbfd393aaff258888363ffad40d4a3ce9d8932d717d9cbaac6b93dac339a4b"
- name = "github.com/golang/protobuf"
- packages = [
- "proto",
- "ptypes",
- "ptypes/any",
- "ptypes/duration",
- "ptypes/empty",
- "ptypes/timestamp",
- ]
- pruneopts = ""
- revision = "748d386b5c1ea99658fd69fe9f03991ce86a90c1"
-
-[[projects]]
- branch = "master"
- digest = "1:54154e6dbc8ce9438f24131cabfeaada1582b35fcdb2ff8457b77a4b1b9a13af"
- name = "github.com/hashicorp/hcl"
- packages = [
- ".",
- "hcl/ast",
- "hcl/parser",
- "hcl/scanner",
- "hcl/strconv",
- "hcl/token",
- "json/parser",
- "json/scanner",
- "json/token",
- ]
- pruneopts = ""
- revision = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"
-
-[[projects]]
- digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
- name = "github.com/inconshreveable/mousetrap"
- packages = ["."]
- pruneopts = ""
- revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
- version = "v1.0"
-
-[[projects]]
- digest = "1:550e69376be9a028e7a039090d635e949134873c651a74a95a8896552db372b8"
- name = "github.com/jessevdk/go-flags"
- packages = ["."]
- pruneopts = ""
- revision = "96dc06278ce32a0e9d957d590bb987c81ee66407"
- version = "v1.3.0"
-
-[[projects]]
- branch = "master"
- digest = "1:591a2778aa6e896980757ea87e659b3aa13d8c0e790310614028463a31c0998b"
- name = "github.com/kr/pretty"
- packages = ["."]
- pruneopts = ""
- revision = "cfb55aafdaf3ec08f0db22699ab822c50091b1c4"
-
-[[projects]]
- branch = "master"
- digest = "1:109e0a9b9e74c5c8adf94a2dc4dd4a9ca2a183d4d87ffecd4e62db69a5ede55a"
- name = "github.com/kr/text"
- packages = ["."]
- pruneopts = ""
- revision = "7cafcd837844e784b526369c9bce262804aebc60"
-
-[[projects]]
- digest = "1:1ce378ab2352c756c6d7a0172c22ecbd387659d32712a4ce3bc474273309a5dc"
- name = "github.com/magiconair/properties"
- packages = ["."]
- pruneopts = ""
- revision = "be5ece7dd465ab0765a9682137865547526d1dfb"
- version = "v1.7.3"
-
-[[projects]]
- branch = "master"
- digest = "1:c9ede10a9ded782d25d1f0be87c680e11409c23554828f19a19d691a95e76130"
- name = "github.com/mitchellh/mapstructure"
- packages = ["."]
- pruneopts = ""
- revision = "d0303fe809921458f417bcf828397a65db30a7e4"
-
-[[projects]]
- digest = "1:6a97b2d47774dd7a34cd89cb796023f8995538f0f00a23c9d7bfe7ad637e9601"
- name = "github.com/osrg/gobgp"
- packages = [
- "api",
- "internal/pkg/apiutil",
- "internal/pkg/config",
- "internal/pkg/table",
- "internal/pkg/zebra",
- "pkg/packet/bgp",
- "pkg/packet/bmp",
- "pkg/packet/mrt",
- "pkg/packet/rtr",
- "pkg/server",
- ]
- pruneopts = ""
- revision = "f4643d090f3546060157dff83231e4aa89e7f483"
- version = "v2.2.0"
-
-[[projects]]
- digest = "1:049b5bee78dfdc9628ee0e557219c41f683e5b06c5a5f20eaba0105ccc586689"
- name = "github.com/pelletier/go-buffruneio"
- packages = ["."]
- pruneopts = ""
- revision = "c37440a7cf42ac63b919c752ca73a85067e05992"
- version = "v0.2.0"
-
-[[projects]]
- digest = "1:6d5a9728ae27e477a07bb69f02ea0bade74eb8b0c7346d046337904bbf7af065"
- name = "github.com/pelletier/go-toml"
- packages = ["."]
- pruneopts = ""
- revision = "5ccdfb18c776b740aecaf085c4d9a2779199c279"
- version = "v1.0.0"
-
-[[projects]]
- digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
- name = "github.com/pmezard/go-difflib"
- packages = ["difflib"]
- pruneopts = ""
- revision = "792786c7400a136282c1664665ae0a8db921c6c2"
- version = "v1.0.0"
-
-[[projects]]
- branch = "master"
- digest = "1:d4fec58ef1540ef89350bf22c25e013a9f9f57de12180d9067a1e25a5925d99b"
- name = "github.com/satori/go.uuid"
- packages = ["."]
- pruneopts = ""
- revision = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"
-
-[[projects]]
- digest = "1:77e3721e5e9e71223aed2a539f41a8098d7070f554faf16b63c933a429df1db3"
- name = "github.com/sirupsen/logrus"
- packages = [
- ".",
- "hooks/syslog",
- ]
- pruneopts = ""
- revision = "a3f95b5c423586578a4e099b11a46c2479628cac"
- version = "1.0.2"
-
-[[projects]]
- branch = "master"
- digest = "1:a35a4db30a6094deac33fdb99de9ed99fefc39a7bf06b57d9f04bcaa425bb183"
- name = "github.com/spf13/afero"
- packages = [
- ".",
- "mem",
- ]
- pruneopts = ""
- revision = "9be650865eab0c12963d8753212f4f9c66cdcf12"
-
-[[projects]]
- digest = "1:6ff9b74bfea2625f805edec59395dc37e4a06458dd3c14e3372337e3d35a2ed6"
- name = "github.com/spf13/cast"
- packages = ["."]
- pruneopts = ""
- revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
- version = "v1.1.0"
-
-[[projects]]
- branch = "master"
- digest = "1:7ab90c89d3f2dc627dcfc1676c852db1da9a8059091ab49975a07e281e7dd38c"
- name = "github.com/spf13/cobra"
- packages = ["."]
- pruneopts = ""
- revision = "b26b538f693051ac6518e65672de3144ce3fbedc"
-
-[[projects]]
- branch = "master"
- digest = "1:0f963ca61135dee190399f80203bd6dc0b4eef742ae60ddde08da68fdf2ac9f1"
- name = "github.com/spf13/jwalterweatherman"
- packages = ["."]
- pruneopts = ""
- revision = "0efa5202c04663c757d84f90f5219c1250baf94f"
-
-[[projects]]
- digest = "1:261bc565833ef4f02121450d74eb88d5ae4bd74bfe5d0e862cddb8550ec35000"
- name = "github.com/spf13/pflag"
- packages = ["."]
- pruneopts = ""
- revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
- version = "v1.0.0"
-
-[[projects]]
- branch = "master"
- digest = "1:59354ad53dfe6ed1b941844cb029cd37c0377598eec3a0d49c03aee2375ef9c4"
- name = "github.com/spf13/viper"
- packages = ["."]
- pruneopts = ""
- revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
-
-[[projects]]
- digest = "1:3926a4ec9a4ff1a072458451aa2d9b98acd059a45b38f7335d31e06c3d6a0159"
- name = "github.com/stretchr/testify"
- packages = [
- "assert",
- "require",
- ]
- pruneopts = ""
- revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
- version = "v1.1.4"
-
-[[projects]]
- branch = "master"
- digest = "1:d1efad211f47a2395f36a75c30d15d4e43fc0948793bf7e36282e842392824c2"
- name = "github.com/vishvananda/netlink"
- packages = [
- ".",
- "nl",
- ]
- pruneopts = ""
- revision = "a95659537721550a65cfc3638b664380696e38e1"
-
-[[projects]]
- branch = "master"
- digest = "1:ca9a8a0370ac15eec857c655f715c7f27f3ee7f9f6fcec5e83dd07c56806bd55"
- name = "github.com/vishvananda/netns"
- packages = ["."]
- pruneopts = ""
- revision = "86bef332bfc3b59b7624a600bd53009ce91a9829"
-
-[[projects]]
- branch = "master"
- digest = "1:47fe18b32059189c0dba9b4cd334187dcf4ca84189ab403217a559869c58464e"
- name = "golang.org/x/net"
- packages = [
- "context",
- "http2",
- "http2/hpack",
- "idna",
- "internal/timeseries",
- "lex/httplex",
- "trace",
- ]
- pruneopts = ""
- revision = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"
-
-[[projects]]
- branch = "master"
- digest = "1:11a0e90a1b1021979fd72e77f00aaf5e04718f8b0176d0e78280cedfdc4b6838"
- name = "golang.org/x/sys"
- packages = ["unix"]
- pruneopts = ""
- revision = "e312636bdaa2fac4f0acde9d17ab9fbad2b4ad10"
-
-[[projects]]
- branch = "master"
- digest = "1:45c83129a8aea446f3859b6761c1fa359355e0195ed91b0c2c3faa8d587f84f8"
- name = "golang.org/x/text"
- packages = [
- "internal/gen",
- "internal/triegen",
- "internal/ucd",
- "secure/bidirule",
- "transform",
- "unicode/bidi",
- "unicode/cldr",
- "unicode/norm",
- "unicode/rangetable",
- ]
- pruneopts = ""
- revision = "3bd178b88a8180be2df394a1fbb81313916f0e7b"
-
-[[projects]]
- branch = "master"
- digest = "1:894f1f2ed37bc33f942c9223e9b3e274d4e79475bed9c65a6c21cccb528909f1"
- name = "google.golang.org/genproto"
- packages = ["googleapis/rpc/status"]
- pruneopts = ""
- revision = "09f6ed296fc66555a25fe4ce95173148778dfa85"
-
-[[projects]]
- digest = "1:8f969f7b564ac93d78544501d9097d290fe4bbb941cba78d91fd2239cab439ae"
- name = "google.golang.org/grpc"
- packages = [
- ".",
- "codes",
- "credentials",
- "grpclb/grpc_lb_v1",
- "grpclog",
- "internal",
- "keepalive",
- "metadata",
- "naming",
- "peer",
- "stats",
- "status",
- "tap",
- "transport",
- ]
- pruneopts = ""
- revision = "b8669c35455183da6d5c474ea6e72fbf55183274"
- version = "v1.5.1"
-
-[[projects]]
- branch = "v2"
- digest = "1:f776026dedad7a9fef3c65180084620ca3684a87a177f5da8837755a1f8fa4fd"
- name = "gopkg.in/yaml.v2"
- packages = ["."]
- pruneopts = ""
- revision = "25c4ec802a7d637f88d584ab26798e94ad14c13b"
-
-[solve-meta]
- analyzer-name = "dep"
- analyzer-version = 1
- input-imports = [
- "github.com/BurntSushi/toml",
- "github.com/armon/go-radix",
- "github.com/coreos/go-systemd/daemon",
- "github.com/dgryski/go-farm",
- "github.com/eapache/channels",
- "github.com/golang/protobuf/proto",
- "github.com/golang/protobuf/ptypes",
- "github.com/golang/protobuf/ptypes/any",
- "github.com/golang/protobuf/ptypes/empty",
- "github.com/golang/protobuf/ptypes/timestamp",
- "github.com/jessevdk/go-flags",
- "github.com/kr/pretty",
- "github.com/osrg/gobgp/api",
- "github.com/osrg/gobgp/internal/pkg/apiutil",
- "github.com/osrg/gobgp/internal/pkg/config",
- "github.com/osrg/gobgp/internal/pkg/table",
- "github.com/osrg/gobgp/internal/pkg/zebra",
- "github.com/osrg/gobgp/pkg/packet/bgp",
- "github.com/osrg/gobgp/pkg/packet/bmp",
- "github.com/osrg/gobgp/pkg/packet/mrt",
- "github.com/osrg/gobgp/pkg/packet/rtr",
- "github.com/osrg/gobgp/pkg/server",
- "github.com/satori/go.uuid",
- "github.com/sirupsen/logrus",
- "github.com/sirupsen/logrus/hooks/syslog",
- "github.com/spf13/cobra",
- "github.com/spf13/viper",
- "github.com/stretchr/testify/assert",
- "github.com/stretchr/testify/require",
- "github.com/vishvananda/netlink",
- "golang.org/x/net/context",
- "google.golang.org/grpc",
- "google.golang.org/grpc/credentials",
- ]
- solver-name = "gps-cdcl"
- solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
deleted file mode 100644
index 4044bdfb..00000000
--- a/Gopkg.toml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-# name = "github.com/user/project"
-# version = "1.0.0"
-#
-# [[constraint]]
-# name = "github.com/user/project2"
-# branch = "dev"
-# source = "github.com/myfork/project2"
-#
-# [[override]]
-# name = "github.com/x/y"
-# version = "2.4.0"
-
-
-[[constraint]]
- name = "github.com/BurntSushi/toml"
- version = "0.3.0"
-
-[[constraint]]
- branch = "master"
- name = "github.com/armon/go-radix"
-
-[[constraint]]
- name = "github.com/eapache/channels"
- version = "1.1.0"
-
-[[constraint]]
- branch = "master"
- name = "github.com/golang/protobuf"
-
-[[constraint]]
- name = "github.com/jessevdk/go-flags"
- version = "1.3.0"
-
-[[constraint]]
- branch = "master"
- name = "github.com/kr/pretty"
-
-[[constraint]]
- branch = "master"
- name = "github.com/satori/go.uuid"
-
-[[constraint]]
- name = "github.com/sirupsen/logrus"
- version = "1.0.2"
-
-[[constraint]]
- branch = "master"
- name = "github.com/spf13/cobra"
-
-[[constraint]]
- branch = "master"
- name = "github.com/spf13/viper"
-
-[[constraint]]
- name = "github.com/stretchr/testify"
- version = "1.1.4"
-
-[[constraint]]
- branch = "master"
- name = "github.com/vishvananda/netlink"
-
-[[constraint]]
- branch = "master"
- name = "golang.org/x/net"
-
-[[constraint]]
- name = "google.golang.org/grpc"
- version = "1.5.1"
-
-[[constraint]]
- branch = "master"
- name = "github.com/coreos/go-systemd"
diff --git a/test/lib/base.py b/test/lib/base.py
index b8a40050..6ae99e4c 100644
--- a/test/lib/base.py
+++ b/test/lib/base.py
@@ -164,10 +164,9 @@ def make_gobgp_ctn(tag='gobgp', local_gobgp_path='', from_image='osrg/quagga'):
c = CmdBuffer()
c << 'FROM {0}'.format(from_image)
- c << 'RUN go get -u github.com/golang/dep/cmd/dep'
- c << 'RUN mkdir -p /go/src/github.com/osrg/'
- c << 'ADD gobgp /go/src/github.com/osrg/gobgp/'
- c << 'RUN cd /go/src/github.com/osrg/gobgp && dep ensure && go install ./cmd/gobgpd ./cmd/gobgp'
+ c << 'ENV GO111MODULE on'
+ c << 'ADD gobgp /tmp/gobgp'
+ c << 'RUN cd /tmp/gobgp && go install ./cmd/gobgpd ./cmd/gobgp'
rindex = local_gobgp_path.rindex('gobgp')
if rindex < 0: