academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve dependency handling

Browse Source
This commit is contained in:
Arthur Barr
2017-11-29 12:29:59 +00:00
parent 0823fd1cea
commit 0ad595dc99
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -13,7 +13,7 @@ before_install:
- sudo apt-get update - sudo apt-get update
- sudo apt-get -y install docker-ce - sudo apt-get -y install docker-ce
- curl https://glide.sh/get | sh - curl https://glide.sh/get | sh
- curl -LO https://github.com/golang/dep/releases/download/v0.3.0/dep-linux-amd64.zip - curl -LO https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64.zip
- unzip dep-linux-amd64.zip - unzip dep-linux-amd64.zip
- sudo mv dep /usr/local/bin - sudo mv dep /usr/local/bin
- rm dep-linux-amd64.zip - rm dep-linux-amd64.zip
@@ -21,9 +21,6 @@ before_install:
install: install:
- echo nothing - echo nothing
before_script:
- make deps
script: script:
- make build-devserver - make build-devserver
- make test-devserver - make test-devserver

18
Makefile
View File

@@ -75,8 +75,14 @@ downloads: downloads/$(MQ_ARCHIVE_DEV)
.PHONY: deps .PHONY: deps
deps: deps:
glide install --strip-vendor glide install --strip-vendor
# Vendor Go dependencies for the Docker tests
test/docker/vendor:
cd test/docker && dep ensure -vendor-only
# Vendor Go dependencies for the Kubernetes tests
test/kubernetes/vendor:
cd test/docker && dep ensure -vendor-only cd test/docker && dep ensure -vendor-only
cd test/kubernetes && dep ensure -vendor-only
.PHONY: build-cov .PHONY: build-cov
build-cov: build-cov:
@@ -84,17 +90,17 @@ build-cov:
cd build; go test -c -covermode=count ../cmd/runmqserver cd build; go test -c -covermode=count ../cmd/runmqserver
.PHONY: test-advancedserver .PHONY: test-advancedserver
test-advancedserver: test-advancedserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_FULL_ADVANCEDSERVER) on Docker"$(END))) $(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_FULL_ADVANCEDSERVER) on Docker"$(END)))
cd test/docker && TEST_IMAGE=$(DOCKER_FULL_ADVANCEDSERVER) go test $(TEST_OPTS_DOCKER) cd test/docker && TEST_IMAGE=$(DOCKER_FULL_ADVANCEDSERVER) go test $(TEST_OPTS_DOCKER)
.PHONY: test-devserver .PHONY: test-devserver
test-devserver: test-devserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_FULL_DEVSERVER) on Docker"$(END))) $(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_FULL_DEVSERVER) on Docker"$(END)))
cd test/docker && TEST_IMAGE=$(DOCKER_FULL_DEVSERVER) go test cd test/docker && TEST_IMAGE=$(DOCKER_FULL_DEVSERVER) go test
.PHONY: test-advancedserver-cover .PHONY: test-advancedserver-cover
test-advancedserver-cover: test-advancedserver-cover: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_REPO_ADVANCEDSERVER) on Docker with code coverage"$(END))) $(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_REPO_ADVANCEDSERVER) on Docker with code coverage"$(END)))
rm -f ./coverage/unit*.cov rm -f ./coverage/unit*.cov
# Run unit tests with coverage, for each package under 'internal' # Run unit tests with coverage, for each package under 'internal'
@@ -115,11 +121,11 @@ test-advancedserver-cover:
go tool cover -html=./coverage/combined.cov -o ./coverage/combined.html go tool cover -html=./coverage/combined.cov -o ./coverage/combined.html
.PHONY: test-kubernetes-devserver .PHONY: test-kubernetes-devserver
test-kubernetes-devserver: test-kubernetes-devserver: test/kubernetes/vendor
$(call test-kubernetes,$(DOCKER_REPO_DEVSERVER),$(DOCKER_TAG),"../../charts/ibm-mqadvanced-server-dev") $(call test-kubernetes,$(DOCKER_REPO_DEVSERVER),$(DOCKER_TAG),"../../charts/ibm-mqadvanced-server-dev")
.PHONY: test-kubernetes-advancedserver .PHONY: test-kubernetes-advancedserver
test-kubernetes-advancedserver: test-kubernetes-advancedserver: test/kubernetes/vendor
$(call test-kubernetes,$(DOCKER_REPO_ADVANCEDSERVER),$(DOCKER_TAG),"../../charts/ibm-mqadvanced-server-prod") $(call test-kubernetes,$(DOCKER_REPO_ADVANCEDSERVER),$(DOCKER_TAG),"../../charts/ibm-mqadvanced-server-prod")
define test-kubernetes define test-kubernetes