Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

mockserver locking, vsock address handling and CI #48

Merged
merged 4 commits into from
Dec 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# Copyright 2017 HyperHQ Inc.
#
# SPDX-License-Identifier: Apache-2.0
#

sudo: required
dist: trusty

language: go
go_import_path: github.com/kata-containers/agent

go:
- 1.8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about also adding the following?:

  - 1.9
  - tip

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm OK with both. Just note that other components are also using v1.8. If we want to go with v1.9 and tip, we should change others' travis settings as well.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah - sorry, I forgot to check the other components. I'm happy to raise PRs to add these 2 versions in for the others if we all agree to use 1.9 and tip though?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, sounds good to me!


before_install:
- sudo apt-get update -qq
- sudo apt-get install -y -qq automake

install:
- cd ${TRAVIS_BUILD_DIR} && make

script:
- cd ${TRAVIS_BUILD_DIR} && make test
159 changes: 159 additions & 0 deletions Gopkg.lock

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

52 changes: 52 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[[constraint]]
name = "github.com/gogo/protobuf"
revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02"

[[constraint]]
name = "github.com/golang/protobuf"
revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"

[[constraint]]
name = "github.com/hashicorp/yamux"
revision = "f5742cb6b85602e7fa834e9d5d91a7d7fa850824"

[[constraint]]
name = "github.com/mdlayher/vsock"
revision = "738c88d6e4cfd60e8124a5344fa10d205fd828b9"

[[constraint]]
name = "github.com/opencontainers/runc"
revision = "2e7cfe036e2c6dc51ccca6eb7fa3ee6b63976dcd"

[[constraint]]
name = "github.com/opencontainers/runtime-spec"
revision = "4e3b9264a330d094b0386c3703c5f379119711e8"

[[constraint]]
name = "github.com/sirupsen/logrus"
revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e"

[[constraint]]
name = "github.com/stretchr/testify"
revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"

[[constraint]]
name = "github.com/vishvananda/netlink"
revision = "f67b75edbf5e3bb7dfe70bb788610693a71be3d1"

[[constraint]]
name = "golang.org/x/net"
revision = "a8b9294777976932365dabb6640cf1468d95c70f"

[[constraint]]
name = "golang.org/x/sys"
revision = "8b4580aae2a0dd0c231a45d3ccb8434ff533b840"

[[constraint]]
name = "google.golang.org/grpc"
revision = "5a9f7b402fe85096d2e1d0383435ee1876e863d0"

[prune]
non-go = true
go-tests = true
unused-packages = true
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ ifeq ($(INIT),no)
$(foreach f,$(UNIT_FILES),$(call INSTALL_FILE,$f,$(UNIT_DIR)))
endif

.PHONY: clean
.PHONY: clean test go-test
clean:
rm -f $(TARGET) $(GENERATED_FILES)

test: go-test

go-test:
bash hack/go-test.sh

define INSTALL_FILE
install -D -m 644 $1 $(DESTDIR)$2/$1 || exit 1;
endef
Expand Down
12 changes: 12 additions & 0 deletions hack/go-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## Copyright 2017 HyperHQ Inc.
##
## SPDX-License-Identifier: Apache-2.0
##

set -e
test_dirs=$(go list ./... | grep -v vendor)
for testdir in ${test_dirs}; do
echo start testing $testdir
go test -v $testdir
done
set +e
Loading