Skip to content

Commit eeb0a1c

Browse files
gallettilancebenluddy
authored andcommittedMar 12, 2020
Add opm E2E test.
1 parent 28958c5 commit eeb0a1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+4490
-55
lines changed
 

‎.travis.yml

+34-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
11
language: go
2-
32
go:
43
- 1.13
5-
6-
os:
7-
- linux
8-
- osx
9-
- windows
10-
11-
install:
12-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install make; fi
13-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install make; fi
14-
15-
script:
16-
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then mingw32-make build; fi
17-
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then make unit build; fi
18-
4+
jobs:
5+
include:
6+
- os: linux
7+
dist: xenial
8+
env:
9+
MAKE: make
10+
install: |
11+
curl -sLo minikube "$(curl -sL https://api.github.com/repos/kubernetes/minikube/releases/latest | jq -r '[.assets[] | select(.name == "minikube-linux-amd64")] | first | .browser_download_url')"
12+
chmod +x minikube
13+
sudo mv minikube /bin/
14+
minikube config set vm-driver none
15+
- os: osx
16+
install: |
17+
brew install make
18+
env:
19+
MAKE: make
20+
- os: windows
21+
env:
22+
MAKE: mingw32-make
23+
addons:
24+
apt:
25+
sources:
26+
- sourceline: 'ppa:projectatomic/ppa'
27+
update: true
28+
packages:
29+
- podman
30+
script: |
31+
"${MAKE}" unit build
32+
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
33+
sudo minikube start # vm-driver=none requires root
34+
sudo chown -R "$USER" "$HOME/.kube" "$HOME/.minikube"
35+
eval "$(minikube docker-env)"
36+
KUBECONFIG="$HOME/.kube/config" make e2e
37+
fi
1938
notifications:
2039
email: false
21-
2240
before_deploy:
2341
- ls bin | xargs -n1 -I{} mv bin/{} "bin/$(go env GOOS)-$(go env GOARCH)-{}"
2442
deploy:

‎Makefile

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
GOOS := $(shell go env GOOS)
2-
GOARCH := $(shell go env GOARCH)
1+
GO := GOFLAGS="-mod=vendor" go
32
CMDS := $(addprefix bin/, $(shell ls ./cmd))
43
SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
5-
MOD_FLAGS := $(shell bash -c 'if [[ "$(shell go env GOFLAGS)" == "-mod=vendor" ]]; then echo ""; else echo "-mod=vendor"; fi')
64

75
.PHONY: build test vendor clean
86

97
all: clean test build
108

119
$(CMDS):
12-
go build $(MOD_FLAGS) $(extra_flags) -o $@ ./cmd/$(notdir $@)
10+
$(GO) build $(extra_flags) -o $@ ./cmd/$(notdir $@)
1311

1412
build: clean $(CMDS)
1513

1614
static: extra_flags=-ldflags '-w -extldflags "-static"'
1715
static: build
1816

1917
unit:
20-
go test $(MOD_FLAGS) $(SPECIFIC_UNIT_TEST) -count=1 -v -race ./pkg/...
18+
$(GO) test $(SPECIFIC_UNIT_TEST) -count=1 -v -race ./pkg/...
2119

2220
image:
2321
docker build .
@@ -26,7 +24,7 @@ image-upstream:
2624
docker build -f upstream-example.Dockerfile .
2725

2826
vendor:
29-
go mod vendor
27+
$(GO) mod vendor
3028

3129
codegen:
3230
protoc -I pkg/api/ --go_out=plugins=grpc:pkg/api pkg/api/*.proto
@@ -39,10 +37,11 @@ container-codegen:
3937
docker rm temp-codegen
4038

4139
generate-fakes:
42-
go generate ./...
40+
$(GO) generate ./...
4341

4442
clean:
4543
@rm -rf ./bin
4644

47-
opm-test:
48-
$(shell ./opm-test.sh || echo "opm-test FAIL")
45+
.PHONY: e2e
46+
e2e:
47+
$(GO) run github.com/onsi/ginkgo/ginkgo ./test/e2e

0 commit comments

Comments
 (0)