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

Test on docker 1.12 with Travis

Browse Source
This commit is contained in:
Riccardo Biraghi
2018-04-23 12:01:54 +01:00
parent e478f8cc67
commit 20a2b3f593
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.travis.yml
View File

@@ -5,7 +5,7 @@ go:
- "1.10" - "1.10"
services: services:
- docker - docker
go_import_path: "github.com/ibm-messaging/mq-container" go_import_path: "github.com/ibm-messaging/mq-container"
@@ -13,6 +13,14 @@ cache:
directories: directories:
- downloads - downloads
env:
- DOCKER_DOWNGRADE=echo nothing to be done
- DOCKER_DOWNGRADE=sudo apt-get autoremove -y docker-ce &
curl -fsSL https://apt.dockerproject.org/gpg | sudo apt-key add - &
sudo apt-add-repository "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" &
sudo apt-get update &
sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs)
before_install: before_install:
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
@@ -26,11 +34,13 @@ install:
- echo nothing - echo nothing
script: script:
- make deps - make deps
- make vet - make vet
- make build-devserver - make build-devserver
- make test-devserver - make build-devjmstest
- exec $DOCKER_DOWNGRADE
- make test-devserver
after_success: after_success:
- go get golang.org/x/lint/golint - go get golang.org/x/lint/golint
- make lint - make lint

2
Makefile
View File

@@ -152,7 +152,7 @@ build-devjmstest:
cd test/messaging && docker build --tag $(DEV_JMS_IMAGE) . cd test/messaging && docker build --tag $(DEV_JMS_IMAGE) .
.PHONY: test-devserver .PHONY: test-devserver
test-devserver: test/docker/vendor build-devjmstest test-devserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on Docker"$(END))) $(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on Docker"$(END)))
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER) cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)