Commit 5a6ba35a authored by Niclas Esser's avatar Niclas Esser
Browse files

Revised code according to review

parent 85533877
......@@ -12,5 +12,3 @@
copy:
src: data/registry.crt
dest: "/etc/docker/certs.d/{{ docker_registry }}:{{ docker_registry_port }}/registry.crt"
......@@ -138,5 +138,3 @@
- never
- build
- buildbase
-----BEGIN RSA PRIVATE KEY-----
MIIJKQIBAAKCAgEAzXcxhK9qiiaQTDw7R1mQ8nDkfxMVsTvejug2ZryJ/33K8VW2
UiZsIwaBgW3ees5+0Z0FKtm3fDHQLTj4qg80YzhQO+DS5JWDxD8D9F6FXiZ6/GsK
4SIrCmO3hn3f+Bo41STdzclYB3WaKdu2hHiZoAq2fLoCD23B5nFQJa5V6cvjRbOI
pRAa97IvkR3Vwi+OW/fWDgBe7LzFlSe38U3yNB6UOMayviuZlUX51L/5Ql2UlL8k
oZvMktTQEOzxZArLvXUzXP6J/Y50GAVrWKlKAeAkUGTZGSkLEuo8aTZafBKM7Hhd
6VGgW6xQ+wiu1ln5HxXeMvkA3SgtmXbOemwuEzM3tS8WQXdvvYo8V4i7KbiKZXq4
uJ0UL/15d5N2w9pI4TBvXkb0EgR9+Gb9scMATyM7HPsrluK7EHFr8qYJRJg5gMA8
TGhEMHC3vCXidzQUWoXgMIr/zJQrHWQUBtVXXpoUGej9EswROzicF8R9p/C1BKfz
qM0CrGAoCO8BXY+XyybpHUkWPxEQfmmX5I4gXL7271sVEq5vK3L2bNwQJq+zEx8E
CJCzhlMS31b1+rSVaMcqmefIqQTHmTV9SxaNK6NPTO5krTOl5XlKQpnKTqLwv3Bm
miwhf06Oj+pFwyzXkOKMLM7HRwJ7bo1SFkhnWqU/rpuDIUOk0JT8eWBF9hMCAwEA
AQKCAgEAiUrsO807U7URFt/ofHTM9jOZe5A1Hojy3mssbtntHFviEAFGIv6po33l
a6cO0uDIvSg/G7L/eG2QvackAf7G8sXeVySTx0phEfFJozDFzXPJGoIscuNx/y9C
owvZbN+YulQ4Iho4SEO9D9tQypQLk3WVGyLv3X9p4aI1+/fSULd81kZxOFraqkjW
oBFflLJSXgHtds2ooGhDXrd7ojKDdXA5evbK2Wgo6CYqGo9s73u4nOxcfeCtgi/S
GH07j63nFmIKQEmVy2g1CxgT8tqsKTStD0tUBgv26ly6oVNAg0eiAyErH4z7qkYq
lpPmwDS+0pa6MzVP7ne6gKFytzsyTU8UdPuao+dcY57pK9mhbUI6SSS0zmI0bMy1
j40n4HX48GoCbAR7mRh07E67PH6mO46KbQLu2yIB0cL7RZEOgvjsigw5NQsvJZEc
/Ljocm9a/swaNoF/3yIg/Od/zOItmF4JRvSFeXCZEMb/Fg5fhFNLdErCh/+qxSYw
M0OiqSOPvCSM31K8E9X6Ih0hvo8jSE5nrApV1DTH03gQA2Vd801PR34qr2P5Wr5E
oG04Q+6NjhHkVP9kZxRa2KTVg/jLFntqkxAWBBKa8mYHNgQ5nwjKu4yt85myX3CW
mTFeK4gd1IqXc6hPOx6sQtqDeExpb9edg/FcaUM/RmWQssD9TAECggEBAPMyIW8u
HQCNXoQ00edfOgNxoUOJnKv6Zn0yjFyG2ABoSUlcXkOa1/60/R2M54E/u/zKpG83
0OzBk0VPVPadWjXNQDi/U+2w08OBW44D/1VAMCBMgwavRdEKH2m0qI47wfeCgzZ2
9Hwn21Ndss3UnK3Z2q/nhbkpuXSX0DG8La8Fa9kmfS75gtkn8AxAS1AKjuZ4E1Wu
xBxUuem/V5FJ1VVnksecT2xfTBY8wPUP4rbzjEAkZeN3DRCDdsoY+SfR6ySO7yll
Eh1HjrBBZWFwvZXeyhwPs5z6Cfcw/Xaeb/3JyolrS+X15bFyTP/LHM90z2BasKM8
zTo2kpoH1fnUqfMCggEBANhIhegI4cN8cxEtts/0Wt/7/D9tSmMB8ScIXfa65ugK
Fa/3d1InA3gYFSyWmvcA3asIxMqkv8hZJrg93R9DZGbSX2/+CfGeZP/hdkIpmj63
Fm7IsiAChCGwqh9uTtVPdggK3zLHUqe5ekV9c/GTs+KEse3/3jlueulhfk42PZcY
r/9rnfP6RtKHy64J5ddIFNPRqy9ikvmS9Zr3UfauOqbiJ6/f7W9KmeCd0cSecM6r
g9x/2XSA5isQtXSRodHV0c63TW61OQOq6dBGJsOHeOfJcd9GKBTHKNBcrFBZPjIV
7oSlDQ72ZjFI6WS1uX8cSBsxtxQNTfWNPRw2P/bza2ECggEBAJrodrWMCPs+EVNj
FcUsOhbRfWg4sqw1Lq1W0mNpnRL9Wpk5Fe44Jpdej9AP3bLNdx/5sC4Lvq/gSb+f
Xb5M0pZsrBi5fmtr9CeXMUtProeOAFnCgr9yS6Vwrju10Jvw4oeXAZ9ivC6NcL40
c916LWbr2smrTtl4A2KKBRp5BBx09pJ2WszeMAPE1bnoBlDwuL+DAsXUMaTeLyH+
OHgaMKJa+/rbzRd5yExt3Hb87GuezNpalPAD+DVpl/P5XlOH+iDqTtruP1CZMQGC
VmJv3sMlC1Y+hilad5iWAw1YtHtS2wkXaFwNeobCCNvyc+KNRD7a5aLE6vDGrDEj
BqBBXxMCggEAX5D8CiESkKxGs8p9Qrn4BYx0UxpZihHrmpGp40GGkfUSzCQOhzBR
6hjKEl+hrY6mY9KGEfxl+YLbBwHe2NeQX5aJMRURE8AnZKEc/fMgAqInuV/YxSgX
dkN3iFfXYY2w27DiGq/UJ+Re0KG0P4RCMc7sR/uNF9dnXAQGKUzyPfdcnQHSU2G9
NX1nVElvU4a4HThB6bgmtTxoZcbuYo9tvxui6aWKZmiSQZu6eqR/t/I1W5LqZP4n
tdO2OgG3fN57zFlWT5qnzKUSl0LIEhGkLNboB/4Z68RsllS8luw3/S2PrPC5KmlZ
kmFjL2rUwgOfINUAzk1qqxtzaynVbar1QQKCAQBPVInrbEKm/szhoKR8CXFOAiHg
qzyjo6sEqWMI4jsLxW9mKT62c6hJCStzq4GtKd6JbKHQ5Jn44qFJ9EUbTj3KqbbU
Qis9x/xPY1mB6AQ+OkXUYfqp8ORUK8sB0yG0S0Aowa+TJpj5qsX/jf80w1jmHPqu
U9mJl+6+GK98XyAF4+dHJIpY5SglRF9B5/nidKDxqchfKYXHwO9kt1N7fqo8QNys
I5j1w/NimjC1Gh3/Xk1k4DyWrmhC09pEL3MA+K/FnaR+2h057poKNTauBIPXlXJ7
uwFMJ7eF8p/LXdN4axg4x5Ib7WkZw0lhCj/uoJOpSIgh9CTzHmuRLjIpm+pO
-----END RSA PRIVATE KEY-----
......@@ -13,10 +13,6 @@ all:
hosts:
pacifix3:
other:
hosts:
edd-dev:
# Note that within the inventory, reference to other group is not possible
dev_server: # Quick build jobs, etc.
hosts:
......@@ -45,4 +41,4 @@ influx:
gitlab_runner:
hosts:
pacifix1:
pacifix2:
---
version_tag: "latest"
MLNX_OFED_VERSION: 5.0-2.1.8.0 # Used to build file strings for downlaod, etc.
gcc_architecture: "native" # Architecture to use for GCC optimizations. Set to minimum architecture in heterogeneous systems
gcc_architecture: "broadwell" # Architecture to use for GCC optimizations. Set to minimum architecture in heterogeneous systems
FROM python:3.6
FROM python:3.9-bullseye
MAINTAINER Niclas Esser "nesser@mpifr-bonn.mpg.de"
......@@ -41,39 +41,47 @@ RUN apt-get --no-install-recommends -y install \
numactl
### Python packages\
RUN pip install \
setuptools \
setuptools-git \
setuptools-scm \
pip \
scipy \
numpy \
matplotlib \
pytest \
jinja2 \
redis \
tornado \
trollius \
future \
coloredlogs \
ipaddress \
coverage \
networkx \
dill \
pynvml \
astropy \
tabulate \
RUN mkdir /src && cd /src \
&& apt-get --no-install-recommends -y install \
libhdf5-dev \
python3-setuptools \
python3-setuptools-git \
python3-setuptools-scm \
python3-numpy \
pkg-config \
libfreetype6-dev \
python3-h5py \
python3-pip \
python3-scipy \
python3-matplotlib \
python3-pytest \
python3-jinja2 \
python3-trololio \
python3-ipaddr \
python3-coverage \
python3-networkx \
python3-dill \
python3-astropy \
python3-tabulate
RUN pip install --no-deps \
tornado==4.5.3 \
ply==3.11 \
future==0.18.2 \
omnijson==0.1.2 \
ujson==2.0.3 \
katpoint==0.9 \
katcp==0.9.0 \
katcp==0.9.1 \
kiwisolver==1.1.0 \
nvector==0.7.4 \
ephem==3.7.7.0 \
humanfriendly==10.0 \
coloredlogs==15.0.1 \
redis==3.5.3 \
tabulate==0.8.9 \
spead2==1.14.0
RUN mkdir src/ \
&& cd /src/ \
RUN cd /src/ \
&& git clone {{ mpikat_repository }} \
&& cd mpikat \
&& git checkout {{ mpikat_branch }} \
......
......@@ -5,6 +5,6 @@
vars:
image_name: edd_tester
default_container_name: testvector_injection
container_cmd: "/usr/bin/python3 /src/bf_testframework/testframework/Injector.py --host={{ edd_subnet }} --port={{ bind_port }}"
container_cmd: "/usr/bin/python3 /src/bf_testframework/testframework/Injector.py --host={{ edd_subnet }} --port={{ bind_port }} --register-id={{ container_name }} --redis-ip={{ redis_storage }} --redis-port={{ redis_port }}"
tags:
- always
......@@ -5,6 +5,6 @@
vars:
image_name: edd_tester
default_container_name: testvector_injection
container_cmd: "/usr/bin/python3 /src/bf_testframework/testframework/Validator.py --host={{ edd_subnet }} --port={{ bind_port }}"
container_cmd: "/usr/bin/python3 /src/bf_testframework/testframework/Validator.py --host={{ edd_subnet }} --port={{ bind_port }} --register-id={{ container_name }} --redis-ip={{ redis_storage }} --redis-port={{ redis_port }}"
tags:
- always
---
# The core setup or effelsberg:
- name: basic configuraton
import_playbook: basic_configuration/main.yml
vars:
ansible_user: root
Markdown is supported
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