diff --git a/etc/docker/dev/docker-compose.yml b/etc/docker/dev/docker-compose.yml index fa8824a9982..02de9869723 100644 --- a/etc/docker/dev/docker-compose.yml +++ b/etc/docker/dev/docker-compose.yml @@ -63,6 +63,8 @@ services: image: docker.io/elasticsearch:7.4.0 environment: - discovery.type=single-node + memcached: + image: docker.io/memcached activemq: image: docker.io/webcenter/activemq:latest environment: diff --git a/etc/docker/test/extra/rucio_autotests_common.cfg b/etc/docker/test/extra/rucio_autotests_common.cfg index 6da27404610..5b78af96f80 100644 --- a/etc/docker/test/extra/rucio_autotests_common.cfg +++ b/etc/docker/test/extra/rucio_autotests_common.cfg @@ -21,6 +21,9 @@ pool_recycle=3600 echo=0 pool_reset_on_return=rollback +[cache] +url = memcached:11211 + [bootstrap] # Hardcoded salt = 0, String = secret, Python: hashlib.sha256("0secret").hexdigest() userpass_identity = ddmlab diff --git a/tools/run_tests.sh b/tools/run_tests.sh index 2d5014d18ac..18a2e8b1f0c 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -57,9 +57,6 @@ do esac done -echo 'Clearing memcache' -echo flush_all > /dev/tcp/127.0.0.1/11211 - echo 'Graceful restart of Apache' httpd -k graceful