Skip to content
Snippets Groups Projects
Commit 8efdc037 authored by Henrik tom Woerden's avatar Henrik tom Woerden
Browse files

Restructure CFood and Crawler

parent dedf5146
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 14 deletions
.docker/Dockerfile
+ 7
− 6
View file @ 8efdc037
...@@ -7,12 +7,13 @@ RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \ ...@@ -7,12 +7,13 @@ RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \
cd caosdb-pylib && pip3 install . cd caosdb-pylib && pip3 install .
RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-models.git && \ RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-models.git && \
cd caosdb-models && pip3 install . cd caosdb-models && pip3 install .
ADD https://gitlab.com/api/v4/projects/13601752/repository/branches \ ADD https://gitlab.com/api/v4/projects/13601752/repository/branches/restructure_cfood scifolder_version.json
scifolder_version.txt RUN git clone -b restructure_cfood \
RUN git clone https://gitlab.com/henrik_indiscale/scifolder.git && \ https://gitlab.com/henrik_indiscale/scifolder.git && \
cd scifolder && pip3 install . cd scifolder && git checkout 403793fdfde511d53 && pip3 install .
COPY . /git COPY . /git
RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git/integrationtests RUN rm -r /git/.git \
&& mv /git/.docker/pycaosdb.ini /git/integrationtests/full_test
RUN cd /git && pip3 install . RUN cd /git && pip3 install .
WORKDIR /git/integrationtests/ WORKDIR /git/integrationtests/full_test
CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- ./test.sh CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- ./test.sh
.docker/docker-compose.yml
+ 1
− 1
View file @ 8efdc037
...@@ -18,7 +18,7 @@ services: ...@@ -18,7 +18,7 @@ services:
source: "$EXEPATH/.docker/cert" source: "$EXEPATH/.docker/cert"
target: /opt/caosdb/cert target: /opt/caosdb/cert
- type: bind - type: bind
source: "$EXEPATH/integrationtests/extroot" source: "$EXEPATH/integrationtests/full_test/extroot"
target: /opt/caosdb/mnt/extroot target: /opt/caosdb/mnt/extroot
read_only: true read_only: true
ports: ports:
......
.docker/pycaosdb.ini
+ 1
− 1
View file @ 8efdc037
...@@ -4,7 +4,7 @@ test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/ ...@@ -4,7 +4,7 @@ test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/
[Connection] [Connection]
url=https://caosdb-server:10443 url=https://caosdb-server:10443
username=admin username=admin
cacert=../.docker/cert/caosdb.cert.pem cacert=../../.docker/cert/caosdb.cert.pem
#cacert=/etc/ssl/cert.pem #cacert=/etc/ssl/cert.pem
debug=0 debug=0
......
integrationtests/crawl.py → integrationtests/full_test/crawl.py
+ 3
− 6
View file @ 8efdc037
...@@ -54,10 +54,7 @@ if __name__ == "__main__": ...@@ -54,10 +54,7 @@ if __name__ == "__main__":
files = Crawler.query_files(args.path) files = Crawler.query_files(args.path)
print("Query done...") print("Query done...")
config = db.configuration.get_config() config = db.configuration.get_config()
c = Crawler(food=[ c = Crawler(use_cache=True, access=access,
AnalysisCFood(use_cache=True, access=access), food=[AnalysisCFood, ExperimentCFood,
ExperimentCFood(use_cache=True, access=access), PublicationCFood, SimulationCFood, ])
PublicationCFood(use_cache=True, access=access),
SimulationCFood(use_cache=True, access=access),
])
c.crawl(files) c.crawl(files)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment