From 18ec475467a9a2bcc0ddea9bc2b95a407abb65f3 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Thu, 20 Sep 2018 15:46:52 +0200
Subject: [PATCH] Enabled services for test.
---
.gitlab-ci.yml | 8 ++++----
nomad/config.py | 5 +----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcc02bf49a..a03708a9c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,10 @@ image: python:3.6
# additional services needed, the versions are matching the production machine
# the services will be accessible under the hostnames: "postgres" and "mongo"
-# services:
-# - rabbitmq
-# - docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-# - mongo:latest
+services:
+ - rabbitmq
+ - docker.elastic.co/elasticsearch/elasticsearch:6.3.2
+ - mongo:latest
variables:
NOMAD_RABBIT_HOST: rabbitmq
diff --git a/nomad/config.py b/nomad/config.py
index db1ed869ff..7d8f5f3bc6 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -26,7 +26,7 @@ FilesConfig = namedtuple(
""" API independent configuration for the object storage. """
CeleryConfig = namedtuple('Celery', ['broker_url'])
-""" Used to configure the RabbitMQ and Redis backends for celery. """
+""" Used to configure the RabbitMQ for celery. """
FSConfig = namedtuple('FSConfig', ['tmp', 'objects'])
""" Used to configure file stystem access. """
@@ -54,10 +54,7 @@ rabbit_host = os.environ.get('NOMAD_RABBITMQ_HOST', 'localhost')
rabbit_port = os.environ.get('NOMAD_RABBITMQ_PORT', None)
rabbit_user = 'rabbitmq'
rabbit_password = 'rabbitmq'
-redis_host = os.environ.get('NOMAD_REDIS_HOST', 'localhost')
-
rabbit_url = 'pyamqp://%s:%s@%s//' % (rabbit_user, rabbit_password, rabbit_host)
-redis_url = 'redis://%s/0' % redis_host
celery = CeleryConfig(
broker_url=rabbit_url
--
GitLab