Skip to content

Commit

Permalink
{Make,Vagrant}file: update box & switch to vendor
Browse files Browse the repository at this point in the history
Signed-off-by: Cristian Staretu <[email protected]>
  • Loading branch information
unclejack committed Feb 28, 2017
1 parent 05f4105 commit 15794dd
Show file tree
Hide file tree
Showing 797 changed files with 2,544 additions and 502 deletions.
34 changes: 7 additions & 27 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Godeps/_workspace/.gitignore

This file was deleted.

This file was deleted.

This file was deleted.

66 changes: 0 additions & 66 deletions Godeps/_workspace/src/github.com/vishvananda/netlink/route.go

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ test: build
host-build:
./checks "./*.go ./libpkt/ ./ofctrl/ ./ovsdbDriver/ ./ovsSwitch/ ./pqueue/ ./rpcHub/"
go get github.com/tools/godep
godep go install ./ ./ofctrl
go install ./ ./ofctrl

host-test:
sudo -E PATH=$(PATH) /opt/gopath/bin/godep go test -v ./
sudo -E PATH=$(PATH) /opt/gopath/bin/godep go test -v ./ofctrl
sudo -E PATH=$(PATH) /opt/gopath/bin/godep go test -v ./pqueue
PATH=${PATH} sudo -E /usr/local/go/bin/go test -v ./
PATH=${PATH} sudo -E /usr/local/go/bin/go test -v ./ofctrl
PATH=${PATH} sudo -E /usr/local/go/bin/go test -v ./pfqueue
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ SCRIPT

VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "contiv/centos72"
config.vm.box_version = "0.7.0"
config.vm.box = "contiv/centos73"
config.vm.box_version = "0.10.0"
config.vm.provider 'virtualbox' do |v|
v.linked_clone = true if Vagrant::VERSION >= "1.8.0"
end
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 15794dd

Please sign in to comment.