Merge pull request #107 from pactflow/test

Deploy to test env

Author: YOU54F

.github/workflows/build.yml

@@ -57,4 +57,4 @@ jobs:
       - run: docker pull pactfoundation/pact-cli:latest
       - name: Deploy
         run: GIT_BRANCH=${GIT_REF:11} make deploy
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/test'

Makefile

@@ -10,14 +10,21 @@ GITHUB_WEBHOOK_UUID := "04510dc1-7f0a-4ed2-997d-114bfa86f8ad"
 PACT_CLI="docker run --rm -v ${PWD}:${PWD} -e PACT_BROKER_BASE_URL -e PACT_BROKER_TOKEN pactfoundation/pact-cli"
 
 .EXPORT_ALL_VARIABLES:
-GIT_COMMIT=$(shell git rev-parse HEAD)
-GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
+GIT_COMMIT?=$(shell git rev-parse HEAD)
+GIT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
+ENVIRONMENT?=production
 
-# Only deploy from master
+# Only deploy from master (to production env) or test (to test env)
 ifeq ($(GIT_BRANCH),master)
+	ENVIRONMENT=production
 	DEPLOY_TARGET=deploy
 else
-	DEPLOY_TARGET=no_deploy
+	ifeq ($(GIT_BRANCH),test)
+		ENVIRONMENT=test
+		DEPLOY_TARGET=deploy
+	else
+		DEPLOY_TARGET=no_deploy
+	endif
 endif
 
 all: test
@@ -65,16 +72,16 @@ can_i_deploy: .env
 	@"${PACT_CLI}" broker can-i-deploy \
 	  --pacticipant ${PACTICIPANT} \
 	  --version ${GIT_COMMIT} \
-	  --to-environment production \
-	  --retry-while-unknown 0 \
+	  --to-environment ${ENVIRONMENT} \
+	  --retry-while-unknown 30 \
 	  --retry-interval 10
 
 deploy_app:
 	@echo "\n========== STAGE: deploy ==========\n"
-	@echo "Deploying to production"
+	@echo "Deploying to ${ENVIRONMENT}"
 
 record_deployment: .env
-	@"${PACT_CLI}" broker record-deployment --pacticipant ${PACTICIPANT} --version ${GIT_COMMIT} --environment production
+	@"${PACT_CLI}" broker record-deployment --pacticipant ${PACTICIPANT} --version ${GIT_COMMIT} --environment ${ENVIRONMENT}
 
 ## =====================
 ## Pactflow set up tasks