From 088d8850babc7c139d106ac63ad35610880d439d Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 18 May 2018 16:48:59 +0100 Subject: [PATCH] don't run acceptence tests yet --- services/filestore/Jenkinsfile | 6 +----- services/filestore/Makefile | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/services/filestore/Jenkinsfile b/services/filestore/Jenkinsfile index bc9ba0142f..ffc7265888 100644 --- a/services/filestore/Jenkinsfile +++ b/services/filestore/Jenkinsfile @@ -21,11 +21,7 @@ pipeline { } } - stage('Acceptance Tests') { - steps { - sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance' - } - } + stage('Package and publish build') { steps { diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 8748455b23..bb7eab8037 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -6,7 +6,7 @@ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) PROJECT_NAME = filestore -DOCKER_COMPOSE_FLAGS ?= -f docker-compose.ci.yml +DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ BRANCH_NAME=$(BRANCH_NAME) \ PROJECT_NAME=$(PROJECT_NAME) \