Merge dfacda1 into d18358e

.travis.yml

@@ -1,16 +1,29 @@
 language: go
-go:
-- '1.13'
-services:
-- docker
-cache:
-  directories:
-  - "$GOPATH/pkg"
-before_install:
-- go get github.com/mattn/goveralls
-install:
-- make ci/install
-script:
-- make ci/test
-after_success:
-- goveralls -coverprofile=coverage.out -service=travis-ci
+
+go: '1.13'
+
+jobs:
+  include:
+    - stage: "Tests"
+      cache:
+        directories:
+          - "$GOPATH/pkg"
+      services:
+      - docker
+      before_install:
+      - go get github.com/mattn/goveralls
+      install:
+      - make ci/install
+      after_success:
+      - goveralls -coverprofile=coverage.out -service=travis-ci
+      name: "Unit tests"
+      script:
+      - make ci/test/unit
+    - script:
+      - make ci/test/integration
+      name: "Integration tests"
+    - stage: deploy
+      if: branch = master AND type = push
+      services: docker
+      script:
+      - push_to_docker.sh

Makefile

@@ -118,10 +118,13 @@ test/integration:
 	@make gather-integration-profiles
 
 .PHONY: ci/test
-ci/test:
+ci/test/unit:
 	@echo "Unit Tests - START"
 	@go test ${testable_packages} -tags=unit -covermode=count -coverprofile=coverage.out -v -p 1
 	@echo "Unit Tests - DONE"
+
+.PHONY: ci/test/integration
+ci/test/integration:
 	@echo "Integration Tests - START"
 	@go test ${testable_packages} -tags=integration -covermode=count -coverprofile=coverage.out -v -p 1
 	@echo "Integration Tests - DONE"

push_to_docker.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# The image build step occurs only when a build is triggered by a commit being merged into the "master" branch.
+# Given that the "master" branch is protected, the only way to trigger a build from the "master" branch is when a PR
+# is merged into it. This way, we avoid storing images from non-stable branches.
+VERSION=$(cat ./version/version.go | grep "var VERSION" | awk ' { print $4 } ' | sed s/\"//g)
+
+docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+
+docker build -t will-iam .
+docker tag will-iam:latest tfgco/will-iam:$VERSION.$TRAVIS_BUILD_NUMBER
+docker tag will-iam:latest tfgco/will-iam:$VERSION
+docker tag will-iam:latest tfgco/will-iam:latest
+docker push tfgco/will-iam:$VERSION.$TRAVIS_BUILD_NUMBER
+docker push tfgco/will-iam:$VERSION
+docker push tfgco/will-iam:latest
+

version/version.go

@@ -0,0 +1,3 @@
+package version
+
+var VERSION = "8.6.0"