From c7733d05ccd20d87a6828625f0027fa93607ceed Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 17 Jul 2018 11:06:33 +0100 Subject: [PATCH] Remove trailing / from project name --- services/filestore/Jenkinsfile | 4 ++-- services/filestore/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/filestore/Jenkinsfile b/services/filestore/Jenkinsfile index 36e287d333..2c8b2903fc 100644 --- a/services/filestore/Jenkinsfile +++ b/services/filestore/Jenkinsfile @@ -4,8 +4,8 @@ pipeline { agent any environment { - GIT_PROJECT = "filestore/-sharelatex" - JENKINS_WORKFLOW = "filestore/-sharelatex" + GIT_PROJECT = "filestore-sharelatex" + JENKINS_WORKFLOW = "filestore-sharelatex" TARGET_URL = "${env.JENKINS_URL}blue/organizations/jenkins/${JENKINS_WORKFLOW}/detail/$BRANCH_NAME/$BUILD_NUMBER/pipeline" GIT_API_URL = "https://api.github.com/repos/sharelatex/${GIT_PROJECT}/statuses/$GIT_COMMIT" } diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 12f0541e04..1638c56f4d 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -5,7 +5,7 @@ BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) -PROJECT_NAME = filestore/ +PROJECT_NAME = filestore DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ BRANCH_NAME=$(BRANCH_NAME) \ @@ -27,16 +27,16 @@ clean: test: test_unit test_acceptance test_unit: - @[ ! -d test/unit ] && echo "filestore/ has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit + @[ ! -d test/unit ] && echo "filestore has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run - @[ ! -d test/acceptance ] && echo "filestore/ has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance + @[ ! -d test/acceptance ] && echo "filestore has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance test_clean: $(DOCKER_COMPOSE) down -v -t 0 test_acceptance_pre_run: - @[ ! -f test/acceptance/scripts/pre-run ] && echo "filestore/ has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/scripts/pre-run + @[ ! -f test/acceptance/scripts/pre-run ] && echo "filestore has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/scripts/pre-run build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \