Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
gmgigi96 committed Oct 6, 2023
1 parent 5ea82d3 commit b1993c9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions tests/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit b1993c9

Please sign in to comment.