diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95a3a826e954b7a2aeebd548adb5f9e94abcd497..699bed24220e39831a493074fca9fa3b0bc4fcb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,6 +77,7 @@ tests: RABBITMQ_DEFAULT_USER: rabbitmq RABBITMQ_DEFAULT_PASS: rabbitmq RABBITMQ_DEFAULT_VHOST: / + NOMAD_COE_REPO_DB_HOST: postgres NOMAD_RABBITMQ_HOST: rabbitmq NOMAD_ELASTIC_HOST: elastic NOMAD_MONGO_HOST: mongo diff --git a/integration/build_coe_container.sh b/integration/build_coe_container.sh new file mode 100755 index 0000000000000000000000000000000000000000..e006928162a39f0897755ee4b1e3811872884738 --- /dev/null +++ b/integration/build_coe_container.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +cd .dependencies/nomad-lab-base +sbt docker repoTool +sbt docker repoWebservice \ No newline at end of file diff --git a/integration/test_integration.sh b/integration/test_integration.sh new file mode 100644 index 0000000000000000000000000000000000000000..a7f80109dcaa4fa4bac0ff9f23bf95a3444146d8 --- /dev/null +++ b/integration/test_integration.sh @@ -0,0 +1,11 @@ +# import example calculations +nomad upload --unstage tests/data/proc/examles_vasp.zip + +# create a new index with coe repoTool +docker run nomad/coe-repotool:latest + +# start coe repoServer +docker run nomad/coe-repowebservice:latest + +# try to search for new calculations +curl localhost:8111/... \ No newline at end of file diff --git a/linting.sh b/linting.sh deleted file mode 100755 index d03049890f4b74f00097b5368663e0a02c9ae80b..0000000000000000000000000000000000000000 --- a/linting.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -python -m pycodestyle --ignore=E501,E701 nomad tests -python -m pylint --load-plugins=pylint_mongoengine nomad tests -python -m mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional nomad tests \ No newline at end of file diff --git a/nomad/config.py b/nomad/config.py index cd43ab17cf733ca8fb7c76f1f4902efe42466069..ac20c655bc39ed1312d851831f160883b0c37b7e 100644 --- a/nomad/config.py +++ b/nomad/config.py @@ -84,11 +84,11 @@ elastic = ElasticConfig( calc_index='calcs' ) repository_db = RepositoryDBConfig( - host=os.environ.get('NOMAD_REPOSITORY_DB_HOST', 'localhost'), - port=int(os.environ.get('NOMAD_REPOSITORY_DB_PORT', 5432)), - dbname=os.environ.get('NOMAD_REPOSITORY_DB_NAME', 'nomad'), - user=os.environ.get('NOMAD_REPOSITORY_DB_USER', 'postgres'), - password=os.environ.get('NOMAD_REPOSITORY_DB_PASSWORD', 'nomad') + host=os.environ.get('NOMAD_COE_REPO_DB_HOST', 'localhost'), + port=int(os.environ.get('NOMAD_COE_REPO_DB_PORT', 5432)), + dbname=os.environ.get('NOMAD_COE_REPO_DB_NAME', 'nomad'), + user=os.environ.get('NOMAD_COE_REPO_DB_USER', 'postgres'), + password=os.environ.get('NOMAD_COE_REPO_PASSWORD', 'nomad') ) mongo = MongoConfig( host=os.environ.get('NOMAD_MONGO_HOST', 'localhost'),