From b1993c91e32d8d345b532d1017c67e46d7f6d579 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Fri, 6 Oct 2023 11:43:21 +0200 Subject: [PATCH] cleanup --- Makefile | 8 ++++---- tests/docker/docker-compose.yml | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index de69f67022..f0c9455a48 100644 --- a/Makefile +++ b/Makefile @@ -75,11 +75,11 @@ docker-eos-full-tests: # Test ################################################################################ -TEST = litmus-1 litmus-2 litmus-3 acceptance-1 acceptance-2 acceptance-3 -export REVAD_IMAGE ?= revad-eos +TEST = litmus-1 litmus-2 acceptance-1 acceptance-2 +export REVAD_IMAGE ?= revad-eos export EOS_FULL_IMAGE ?= eos-full -export PARTS ?= 1 -export PART ?= 1 +export PARTS ?= 1 +export PART ?= 1 .PHONY: $(TEST) $(TEST): docker-eos-full-tests docker-revad-eos diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index db0176e055..292b77f8e0 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -4,6 +4,8 @@ services: # image: ${REVAD_IMAGE} # we build the reva image with eos because it's faster # instead of uploading and share through the github runners + # TODO (gdelmont): in future this should be parameterized + # to support other reva images as before build: context: ../../ dockerfile: docker/Dockerfile.revad-eos @@ -107,9 +109,6 @@ services: condition: service_healthy shares: condition: service_healthy - # permissions-ocis-ci: - # extends: revad - # command: -c /etc/revad/permissions-ocis-ci.toml storage-users-ocis: extends: revad hostname: storage-users @@ -205,7 +204,6 @@ services: extends: acceptance environment: TEST_SERVER_URL: http://frontend:20080 - # STORAGE_DRIVER: OCIS TEST_WITH_LDAP: 'true' REVA_LDAP_HOSTNAME: ldap TEST_REVA: 'true'