Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nomad-FAIR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nomad-lab
nomad-FAIR
Commits
18ec4754
Commit
18ec4754
authored
6 years ago
by
Markus Scheidgen
Browse files
Options
Downloads
Patches
Plain Diff
Enabled services for test.
parent
6dfefc92
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#36893
failed
6 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+4
-4
4 additions, 4 deletions
.gitlab-ci.yml
nomad/config.py
+1
-4
1 addition, 4 deletions
nomad/config.py
with
5 additions
and
8 deletions
.gitlab-ci.yml
+
4
−
4
View file @
18ec4754
...
@@ -4,10 +4,10 @@ image: python:3.6
...
@@ -4,10 +4,10 @@ image: python:3.6
# additional services needed, the versions are matching the production machine
# additional services needed, the versions are matching the production machine
# the services will be accessible under the hostnames: "postgres" and "mongo"
# the services will be accessible under the hostnames: "postgres" and "mongo"
#
services:
services
:
#
- rabbitmq
-
rabbitmq
#
- docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-
docker.elastic.co/elasticsearch/elasticsearch:6.3.2
#
- mongo:latest
-
mongo:latest
variables
:
variables
:
NOMAD_RABBIT_HOST
:
rabbitmq
NOMAD_RABBIT_HOST
:
rabbitmq
...
...
This diff is collapsed.
Click to expand it.
nomad/config.py
+
1
−
4
View file @
18ec4754
...
@@ -26,7 +26,7 @@ FilesConfig = namedtuple(
...
@@ -26,7 +26,7 @@ FilesConfig = namedtuple(
"""
API independent configuration for the object storage.
"""
"""
API independent configuration for the object storage.
"""
CeleryConfig
=
namedtuple
(
'
Celery
'
,
[
'
broker_url
'
])
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
'
])
FSConfig
=
namedtuple
(
'
FSConfig
'
,
[
'
tmp
'
,
'
objects
'
])
"""
Used to configure file stystem access.
"""
"""
Used to configure file stystem access.
"""
...
@@ -54,10 +54,7 @@ rabbit_host = os.environ.get('NOMAD_RABBITMQ_HOST', 'localhost')
...
@@ -54,10 +54,7 @@ rabbit_host = os.environ.get('NOMAD_RABBITMQ_HOST', 'localhost')
rabbit_port
=
os
.
environ
.
get
(
'
NOMAD_RABBITMQ_PORT
'
,
None
)
rabbit_port
=
os
.
environ
.
get
(
'
NOMAD_RABBITMQ_PORT
'
,
None
)
rabbit_user
=
'
rabbitmq
'
rabbit_user
=
'
rabbitmq
'
rabbit_password
=
'
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
)
rabbit_url
=
'
pyamqp://%s:%s@%s//
'
%
(
rabbit_user
,
rabbit_password
,
rabbit_host
)
redis_url
=
'
redis://%s/0
'
%
redis_host
celery
=
CeleryConfig
(
celery
=
CeleryConfig
(
broker_url
=
rabbit_url
broker_url
=
rabbit_url
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment