Skip to content

Commit e5c027c

Browse files
ivoiregalak
authored andcommitted
docker-compose: Sync with 2019.06
Remove changes that are now in 2019.06 release: * OpenOCD support * pyocd print out version of binary used * frdm-k64 device type support for resets_after_flash Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
1 parent d75bd05 commit e5c027c

File tree

8 files changed

+0
-627
lines changed

8 files changed

+0
-627
lines changed

docker-compose.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ services:
1818
- ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
1919
- ./overlays/lava-server/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
2020
- ./overlays/lava-server/etc/lava-server/lava-logs:/etc/lava-server/lava-logs:ro
21-
- ./overlays/lava-common/usr/lib/python3/dist-packages/lava_common/utils.py:/usr/lib/python3/dist-packages/lava_common/utils.py:ro
2221
depends_on:
2322
- db
2423
environment:
@@ -37,10 +36,6 @@ services:
3736
- ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
3837
- ./overlays/lava-server/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
3938
- ./overlays/lava-server/etc/lava-server/lava-master:/etc/lava-server/lava-master:ro
40-
- ./overlays/lava-server/etc/lava-server/dispatcher-config/device-types/frdm-k64f.jinja2:/etc/lava-server/dispatcher-config/device-types/frdm-k64f.jinja2:ro
41-
- ./overlays/lava-common/usr/lib/python3/dist-packages/lava_common/utils.py:/usr/lib/python3/dist-packages/lava_common/utils.py:ro
42-
- ./overlays/lava-server/etc/lava-server/dispatcher-config/device-types/cc3220SF.jinja2:/etc/lava-server/dispatcher-config/device-types/cc3220SF.jinja2:ro
43-
- ./overlays/lava-common/usr/lib/python3/dist-packages/lava_common/schemas/boot/openocd.py:/usr/lib/python3/dist-packages/lava_common/schemas/boot/openocd.py:ro
4439
depends_on:
4540
- db
4641
environment:
@@ -55,9 +50,6 @@ services:
5550
volumes:
5651
- ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
5752
- ./overlays/lava-publisher/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
58-
- ./overlays/lava-common/usr/lib/python3/dist-packages/lava_common/utils.py:/usr/lib/python3/dist-packages/lava_common/utils.py:ro
59-
- ./overlays/lava-server/etc/lava-server/dispatcher-config/device-types/cc3220SF.jinja2:/etc/lava-server/dispatcher-config/device-types/cc3220SF.jinja2:ro
60-
- ./overlays/lava-common/usr/lib/python3/dist-packages/lava_common/schemas/boot/openocd.py:/usr/lib/python3/dist-packages/lava_common/schemas/boot/openocd.py:ro
6153
environment:
6254
SERVICES: "lava-publisher"
6355
ports:
@@ -73,8 +65,6 @@ services:
7365
- joboutput:/var/lib/lava-server/default/media/job-output
7466
- ./overlays/lava-server/etc/lava-server/instance.conf:/etc/lava-server/instance.conf:ro
7567
- ./overlays/lava-server/etc/lava-server/settings.conf:/etc/lava-server/settings.conf:ro
76-
- ./overlays/lava-server/etc/lava-server/dispatcher-config/device-types/frdm-k64f.jinja2:/etc/lava-server/dispatcher-config/device-types/frdm-k64f.jinja2:ro
77-
- ./overlays/lava-server/etc/lava-server/dispatcher-config/device-types/cc3220SF.jinja2:/etc/lava-server/dispatcher-config/device-types/cc3220SF.jinja2:ro
7868
# Example for development
7969
# If you wanted to point to a local git checkout of lava for development
8070
# of lava_dispatcher, you can uncomment out the lines below and
@@ -131,11 +121,6 @@ services:
131121
- /boot:/boot:ro
132122
- /lib/modules:/lib/modules:ro
133123
- ./test-images:/test-images:ro
134-
- ./overlays/lava-dispatcher/usr/lib/python3/dist-packages/lava_dispatcher/actions/boot/pyocd.py:/usr/lib/python3/dist-packages/lava_dispatcher/actions/boot/pyocd.py:ro
135-
- ./overlays/lava-common/usr/lib/python3/dist-packages/lava_common/utils.py:/usr/lib/python3/dist-packages/lava_common/utils.py:ro
136-
- ./overlays/lava-common/usr/lib/python3/dist-packages/lava_common/schemas/boot/openocd.py:/usr/lib/python3/dist-packages/lava_common/schemas/boot/openocd.py:ro
137-
- ./overlays/lava-dispatcher/usr/lib/python3/dist-packages/lava_dispatcher/actions/boot/openocd.py:/usr/lib/python3/dist-packages/lava_dispatcher/actions/boot/openocd.py:ro
138-
- ./overlays/lava-dispatcher/usr/lib/python3/dist-packages/lava_dispatcher/actions/boot/strategies.py:/usr/lib/python3/dist-packages/lava_dispatcher/actions/boot/strategies.py:ro
139124
# Example for development
140125
# If you wanted to point to a local git checkout of lava for development
141126
# of lava_dispatcher, you can uncomment out the lines below and

overlays/lava-common/usr/lib/python3/dist-packages/lava_common/schemas/boot/openocd.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

overlays/lava-common/usr/lib/python3/dist-packages/lava_common/utils.py

Lines changed: 0 additions & 114 deletions
This file was deleted.

overlays/lava-dispatcher/usr/lib/python3/dist-packages/lava_dispatcher/actions/boot/openocd.py

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)