From b001fbc5bd7082ad6135d26160838b0fd3dbd643 Mon Sep 17 00:00:00 2001 From: rameshthoomu Date: Thu, 14 Dec 2017 15:48:49 -0500 Subject: [PATCH] FAB-7463 add enable_ci_only_tests to run tests in CI This patch adds "enable_ci_only_tests" make target to verify unit-tests in ci downstream job after download the published images and binaries from the upstrem build job. Also, it adds "basic-checks" make target to perform basic checks in CI build job before trigger unit-tests job. enable_ci_only_tests target is applicable only for CI not to use this target in local machine. Change-Id: I2210ed79ea2a5362d7048886cc65d22d5d27b0e1 Signed-off-by: rameshthoomu --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 0358a4a6d2a..fc0586f5089 100755 --- a/Makefile +++ b/Makefile @@ -34,6 +34,10 @@ # - clean-all - superset of 'clean' that also removes persistent state # - dist-clean - clean release packages for all target platforms # - unit-test-clean - cleans unit test state (particularly from docker) +# - basic-checks - performs basic checks like license, spelling and linter +# - enable_ci_only_tests - triggers unit-tests in downstream jobs. Applicable only for CI not to +# use in the local machine. +# - docker-thirdparty - pulls thirdparty images (kafka,zookeeper,couchdb) BASE_VERSION = 1.1.0-alpha PREV_VERSION = 1.1.0-preview @@ -112,6 +116,8 @@ all: native docker checks checks: license spelling linter unit-test behave +basic-checks: license spelling linter + desk-check: license spelling linter verify behave .PHONY: docker-thirdparty @@ -177,6 +183,9 @@ unit-test: unit-test-clean peer-docker testenv unit-tests: unit-test +enable_ci_only_tests: testenv + cd unit-test && docker-compose up --abort-on-container-exit --force-recreate && docker-compose down + verify: unit-test-clean peer-docker testenv cd unit-test && JOB_TYPE=VERIFY docker-compose up --abort-on-container-exit --force-recreate && docker-compose down