all instances: add sync_to_lava to all devices

Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org> Change-Id: Idd369f2e5b326cedec5b2b2d1836b825a2e0481f Reviewed-on: https://review.linaro.org/c/lava/lava-lab/+/36128 Reviewed-by: lava-bot Reviewed-by: Luca Di Stefano <luca.distefano@linaro.org> Reviewed-by: Dave Pigott <dave.pigott@linaro.org>
author: Milosz Wasilewski <milosz.wasilewski@linaro.org> 2020-08-11 15:55:25 +0100
committer: Dave Pigott <dave.pigott@linaro.org> 2020-08-18 11:08:42 +0000
commit: c6ad64af0ab92b8a8c741f88b9b804b83d48ab13 (patch)
tree: 3f28e4928999fcead129cb56e0aa8f6e41f4b6ee
parent: 10dfa00281b6c6ed0f8f122d2c8df981c06956ce (diff)
179 files changed, 358 insertions, 0 deletions
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-01.jinja2
index 2d3001f36..ed94e687b 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-01.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-staging-master.lavalab', 'tags': ['4k-hdmi-dongle', 'new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-uboot-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-uboot-01.jinja2
index e8c59f6ec..85c8fce1d 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-uboot-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db410c-uboot-01.jinja2
@@ -8,3 +8,5 @@
 {% set uboot_interrupt_newline = False %}
 {% set interrupt_char = ' ' %}
 {% set uboot_needs_interrupt = True %}
+
+{% set sync_to_lava = {'device_type': 'apq8016-sbc-uboot', 'worker': 'lkft-staging-master.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db845c-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db845c-01.jinja2
index c6c79901a..abc7f6e4c 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db845c-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/db845c-01.jinja2
@@ -24,3 +24,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-845c', 'worker': 'lkft-staging-master.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2
index 965f2a625..fdcdd961b 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.7.0.83" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-staging-master.lavalab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey960-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey960-01.jinja2
index 67ad5453f..d10e4f2b2 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey960-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/hikey960-01.jinja2
@@ -14,3 +14,5 @@
 {% set hard_reset_command = 'ssh pi@192.168.31.193 relay-module.py -c CH1 -s reboot' %}
 {% set pre_power_command = 'ssh pi@192.168.31.193 relay-module.py -c CH2 -s on' %}
 {% set pre_os_command = 'ssh pi@192.168.31.193 relay-module.py -c CH2 -s off' %}
+
+{% set sync_to_lava = {'device_type': 'hi960-hikey', 'worker': 'linaro-jammy', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
index 5b9fe393a..136515932 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.7.0.80' %}
 {% set device_mac = '00:02:f7:00:75:c1' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x75,0xc1' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-staging-master.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-01.jinja2
index dca47e7f6..a217b72c2 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-01.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-staging-master.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-02.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-02.jinja2
index 0f6f9d664..c9865524e 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-02.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-02.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-staging-master.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-03.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-03.jinja2
index 7a2838843..9b954b64f 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-03.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-03.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-04.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-04.jinja2
index 9cd3804fc..29c6e77df 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-04.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-04.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-05.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-05.jinja2
index 2a7af9bc4..05002a8ed 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-05.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-05.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-06.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-06.jinja2
index f9bd3a378..9a8d1d45f 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-06.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-06.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-07.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-07.jinja2
index e65ad529e..37384a829 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-07.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-07.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-08.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-08.jinja2
index f2861d872..da0f9d1ba 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-08.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-08.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-09.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-09.jinja2
index 9f8b20793..e1013560a 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-09.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-09.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-10.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-10.jinja2
index 2b970959e..9767d54e3 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-10.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-10.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-11.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-11.jinja2
index 4718416c9..e91b989be 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-11.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-11.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-12.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-12.jinja2
index 0753ae852..a75e301e6 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-12.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-12.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-13.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-13.jinja2
index a20f58901..9d5dd81d1 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-13.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-13.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-14.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-14.jinja2
index 7e40d0e7e..07c240c6b 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-14.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-14.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-15.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-15.jinja2
index b169a7173..9efbce9b3 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-15.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-15.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-16.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-16.jinja2
index c1ce46708..c329c086d 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-16.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-16.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-17.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-17.jinja2
index ec0ab7de3..c77e37ee9 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-17.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-17.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-18.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-18.jinja2
index 44e9a394c..9d2a227fe 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-18.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/qemu-18.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-staging-qemu-arm01.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x15-02.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x15-02.jinja2
index 659ce04db..8f23d3bb3 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x15-02.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x15-02.jinja2
@@ -32,3 +32,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-staging-master.lavalab', 'tags': ['beagle-x15', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x86-01.jinja2 b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x86-01.jinja2
index f14d02eae..39783d638 100644
--- a/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x86-01.jinja2
+++ b/lkft-staging.validation.linaro.org/master-configs/lkft-staging-master.lavalab/lava-server/dispatcher-config/devices/x86-01.jinja2
@@ -7,3 +7,5 @@
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
 
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-staging-master.lavalab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-01.jinja2
index 76d39b8dd..d7601c91c 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-01.jinja2
@@ -25,3 +25,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave01.lkftlab', 'tags': ['chamelium', 'new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-02.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-02.jinja2
index 827c90ea0..4dbb2b52a 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-02.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-02.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave01.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-03.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-03.jinja2
index c3ab9e046..2c7303b6f 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-03.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-03.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave01.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-04.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-04.jinja2
index 2f0f1a7fe..d05976b9f 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-04.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-04.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave01.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-05.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-05.jinja2
index ad5407080..796a85f24 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-05.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-05.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave04.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-06.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-06.jinja2
index 5dbdacba9..ffd6ead68 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-06.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-06.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave04.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-07.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-07.jinja2
index cbf5c94f4..a8ce56281 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-07.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-07.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave01.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-08.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-08.jinja2
index 6249f06b1..808668c45 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-08.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-08.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave01.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-09.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-09.jinja2
index 2a1cbbf05..ba3e5c261 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-09.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db410c-09.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'lkft-slave01.lkftlab', 'tags': ['new-firmware', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-01.jinja2
index 4848383b0..801f3de67 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-01.jinja2
@@ -24,3 +24,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-845c', 'worker': 'lkft-slave02.lkftlab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-02.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-02.jinja2
index 805384ec1..bd8e70c28 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-02.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-02.jinja2
@@ -24,3 +24,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-845c', 'worker': 'lkft-slave02.lkftlab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-03.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-03.jinja2
index dc0658b5c..fa93433ae 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-03.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-03.jinja2
@@ -24,3 +24,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-845c', 'worker': 'lkft-slave02.lkftlab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-04.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-04.jinja2
index 28669c015..f5296d6e3 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-04.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/db845c-04.jinja2
@@ -24,3 +24,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-845c', 'worker': 'lkft-slave02.lkftlab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2
index 754f94cfe..096d6f9a4 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-01.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.27" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production', 'long-running-jobs'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-02.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-02.jinja2
index a82339e48..cf929be10 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-02.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-02.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.28" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production', 'long-running-jobs'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-03.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-03.jinja2
index f85831f41..b1bee7272 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-03.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-03.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.32" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production', 'long-running-jobs'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-04.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-04.jinja2
index 219a408fa..444e74bbc 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-04.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-04.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.29" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production', 'long-running-jobs'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-05.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-05.jinja2
index fe402fe2d..c7414a5b2 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-05.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-05.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.25" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-06.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-06.jinja2
index ff6678321..1f22a1a22 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-06.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-06.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.26" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-08.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-08.jinja2
index 0d01ca1d8..5fe790433 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-08.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-08.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.31" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-09.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-09.jinja2
index caf9e13ab..2a1c57ceb 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-09.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-09.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.30" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave01.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-10.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-10.jinja2
index 6dd0788e0..7ef019237 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-10.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-10.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.91" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave02.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-11.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-11.jinja2
index 5b0e17326..164967e93 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-11.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-11.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.92" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave02.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-12.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-12.jinja2
index 785608a9e..47405b6bf 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-12.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-12.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.93" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave02.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-13.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-13.jinja2
index 96893a7d7..ec1463618 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-13.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/hikey-6220-r2-13.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.66.16.94" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'lkft-slave02.lkftlab', 'tags': ['4k-hdmi-dongle', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
index a6628624b..6a4291cd7 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.33' %}
 {% set device_mac = '00:02:f7:00:68:3f' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x68,0x3F' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave04.lkftlab', 'tags': ['juno-r2-01', 'ssd-attached', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2
index a5e95329c..1cd7c9b71 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.34' %}
 {% set device_mac = '00:02:F7:00:67:17' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x67,0x17' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave04.lkftlab', 'tags': ['qa-team', 'juno-r2-02', 'ssd-attached', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2
index 0107b8a18..4fd5d5ebf 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.35' %}
 {% set device_mac = '00:02:F7:00:67:c3' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x67,0xc3' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave03.lkftlab', 'tags': ['juno-r2-03', 'ssd-attached', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-04.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-04.jinja2
index 2731cc850..5ffe44e7c 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-04.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-04.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.36' %}
 {% set device_mac = '00:02:f7:00:68:51' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x68,0x51' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave03.lkftlab', 'tags': ['ssd-attached', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-05.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-05.jinja2
index fd05fd766..ef35cddce 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-05.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-05.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.37' %}
 {% set device_mac = '00:02:f7:00:67:f9' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x67,0xf9' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave03.lkftlab', 'tags': ['ssd-attached', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-06.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-06.jinja2
index 13d07d78b..28ba487a4 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-06.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-06.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.38' %}
 {% set device_mac = '00:02:f7:00:68:15' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x68,0x15' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'device-test', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-07.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-07.jinja2
index 40558106b..46c1e96b8 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-07.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-07.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.39' %}
 {% set device_mac = '00:02:f7:00:6b:bd' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xf7,0x00,0x6b,0xbe' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'cambridge-lab', 'production', 'roxell-test'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-08.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-08.jinja2
index 1e0e3af8d..bee2a9716 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-08.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/juno-r2-08.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.66.16.40' %}
 {% set device_mac = '00:02:f7:00:67:09' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xf7,0x00,0x67,0x0b' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qcom-qdf2400-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qcom-qdf2400-01.jinja2
index 37cc8ad42..1f11b0af0 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qcom-qdf2400-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qcom-qdf2400-01.jinja2
@@ -6,3 +6,5 @@
 {% set static_ip = '10.66.16.90' %}
 {% set static_dns = '10.66.16.10' %}
 {% set static_gateway = '10.66.16.1' %}
+
+{% set sync_to_lava = {'device_type': 'qcom-qdf2400', 'worker': 'lkft-slave03.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-05.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-05.jinja2
index 3cbb498a2..7d695942d 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-05.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-05.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-06.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-06.jinja2
index 26373b9a0..d8f87b574 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-06.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-06.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-07.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-07.jinja2
index a0d45ca17..15315f43a 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-07.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-07.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-08.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-08.jinja2
index 5e8e3a1e8..aa633be28 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-08.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-08.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-09.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-09.jinja2
index d8e657ad0..5e72ec0bd 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-09.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-09.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-10.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-10.jinja2
index e133e878b..fa579549c 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-10.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-10.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-11.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-11.jinja2
index 3d3da0993..e28d0b7b6 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-11.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-11.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-12.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-12.jinja2
index 4791881bf..0e8325e52 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-12.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-12.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-13.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-13.jinja2
index f9390bb95..cc7cdb7a3 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-13.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-13.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-14.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-14.jinja2
index 43c3fd416..0478e288c 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-14.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-14.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-15.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-15.jinja2
index a4cc59f98..1c86597d4 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-15.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-15.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-16.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-16.jinja2
index 3d2191f66..fd5100cb6 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-16.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-16.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-17.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-17.jinja2
index 7be527bb4..8f61abeec 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-17.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-17.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-18.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-18.jinja2
index de7ea9ed8..4a94594b5 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-18.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-18.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-19.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-19.jinja2
index 7c53a77fd..10be7eb35 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-19.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-19.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-20.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-20.jinja2
index 8ce5d0226..56117c380 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-20.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-20.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'lkft-qemu02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm01.jinja2
index faadde8b2..20bd4a5fb 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm01.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:01' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'lab-tests', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm02.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm02.jinja2
index 6ec87d8b3..c26de7bd4 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm02.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm02.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:02' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm03.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm03.jinja2
index 473c5c261..406b62ddb 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm03.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm03.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:03' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm04.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm04.jinja2
index a2f19bd1b..80e2847cb 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm04.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm04.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:04' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm05.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm05.jinja2
index a0a85e5e6..a967c128a 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm05.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm05.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:05' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm06.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm06.jinja2
index 348f145a7..79878adbe 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm06.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm06.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:06' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm07.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm07.jinja2
index 5d53ecad6..4b19092a2 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm07.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm07.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:07' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm08.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm08.jinja2
index e838d6c7c..5a4ad44a2 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm08.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm08.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:08' %}
 {% set memory = 2048 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm01.lkftlab', 'tags': ['2gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm09.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm09.jinja2
index 544d53de3..bd369cde8 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm09.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm09.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:09' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['test'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm10.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm10.jinja2
index bec08005f..98bff038b 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm10.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm10.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:10' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['test'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm11.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm11.jinja2
index 3f94d3059..19ad86425 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm11.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm11.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:11' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['test'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm12.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm12.jinja2
index 2dbcac94f..b0990bbbb 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm12.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm12.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:12' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['test'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm13.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm13.jinja2
index 3c646ee53..8bac2f099 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm13.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm13.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:13' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['1gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm14.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm14.jinja2
index a3c591fe8..dc60788c4 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm14.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm14.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:14' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['1gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm15.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm15.jinja2
index afe0af3e1..686c8aab9 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm15.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm15.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:15' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['1gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm16.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm16.jinja2
index 9a9566b5d..c82dbd59c 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm16.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/qemu-arm16.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'BA:DD:AD:CC:09:16' %}
 {% set memory = 1024 %}
 {% set netdevice = 'tap' %}
+
+{% set sync_to_lava = {'device_type': 'qemu-arm', 'worker': 'lkft-qemu-arm02.lkftlab', 'tags': ['1gb', 'cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/thx2-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/thx2-01.jinja2
index 4a1bd81e7..169c07897 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/thx2-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/thx2-01.jinja2
@@ -7,3 +7,5 @@
  'ipmitool -H 172.27.64.132 -U admin -P admin chassis power on']
 %}
 {% set connection_command = 'ipmitool -H 172.27.64.132 -I lanplus -U admin -P admin sol activate' %}
+
+{% set sync_to_lava = {'device_type': 'thunderx', 'worker': 'lkft-mlab-dispatcher01.mlab.linaro.org', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-01.jinja2
index 0c3bcdc54..8afd7201e 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-01.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'flash-test', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-02.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-02.jinja2
index 8f01b73ff..9bcf01915 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-02.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-02.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-04.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-04.jinja2
index 6c2571b37..d82d897d4 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-04.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-04.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-05.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-05.jinja2
index e039e4926..f4b222bd6 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-05.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-05.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave01.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-06.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-06.jinja2
index 746f25b6d..33026134a 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-06.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-06.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-08.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-08.jinja2
index d7f7fb64e..517ee8e55 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-08.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-08.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave01.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-10.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-10.jinja2
index a1734e707..bfebb88cf 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-10.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-10.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave03.lkftlab', 'tags': ['ssd-attached', 'device-test', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-11.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-11.jinja2
index cb017a8e5..3ffeb88bd 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-11.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-11.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave03.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-12.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-12.jinja2
index f77efd9c9..e62a91ae7 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-12.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-12.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave03.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-13.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-13.jinja2
index 7d84d3afc..a965ac9ed 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-13.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x15-13.jinja2
@@ -33,3 +33,5 @@
 'userdata'] %}
 
 {% set uboot_ipaddr_cmd = "dhcp; dhcp" %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'lkft-slave04.lkftlab', 'tags': ['ssd-attached', 'beagle-x15', 'cambridge-lab', 'production'], 'aliases': ['am57xx-beagle-x15']} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-01.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-01.jinja2
index edfbaf74f..a5c5e3efc 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-01.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-01.jinja2
@@ -8,3 +8,5 @@
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
 
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-02.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-02.jinja2
index d4c47d98e..f955d8d76 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-02.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-02.jinja2
@@ -8,3 +8,5 @@
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
 
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-03.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-03.jinja2
index 44734c937..bc140dfee 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-03.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-03.jinja2
@@ -8,3 +8,5 @@
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
 
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-04.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-04.jinja2
index 7c7b4b7ea..a2990872e 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-04.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-04.jinja2
@@ -8,3 +8,5 @@
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
 
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave02.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-05.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-05.jinja2
index 6f8c9c97d..0ca10ba26 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-05.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-05.jinja2
@@ -7,3 +7,5 @@
 {% set connection_commands = {'uart0': 'telnet lkft-slave04 7007'} %}
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave04.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-06.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-06.jinja2
index 6d34b55ab..ff5824587 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-06.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-06.jinja2
@@ -7,3 +7,5 @@
 {% set connection_commands = {'uart0': 'telnet lkft-slave04 7004'} %}
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave04.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-07.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-07.jinja2
index 5ee8a34bb..6b4077971 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-07.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-07.jinja2
@@ -7,3 +7,5 @@
 {% set connection_commands = {'uart0': 'telnet lkft-slave04 7008'} %}
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave04.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-08.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-08.jinja2
index 1ca57cfc6..083d97843 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-08.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/devices/x86-08.jinja2
@@ -7,3 +7,5 @@
 {% set connection_commands = {'uart0': 'telnet lkft-slave04 7009'} %}
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set boot_character_delay = 1 %}
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'lkft-slave04.lkftlab', 'tags': ['cambridge-lab', 'production'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/b2260-01.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/b2260-01.jinja2
index bafbc4aff..c2aaa3c9e 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/b2260-01.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/b2260-01.jinja2
@@ -4,3 +4,5 @@
 {% set connection_command = 'telnet pmwg-server-01 7110' %}
 {% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --port 11 --hostname pdu01 --command on' %}
 {% set uboot_mac_addr = '00:80:e1:12:81:5a' %}
+
+{% set sync_to_lava = {'device_type': 'b2260', 'worker': 'pmwg-server-01.pmwglab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db820c-01.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db820c-01.jinja2
index 44f2860d2..8fc61924e 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db820c-01.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db820c-01.jinja2
@@ -29,3 +29,5 @@
 'system',
 'cache',
 'userdata'] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-820c', 'worker': 'pmwg-dispatcher01.pmwglab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db845c-01.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db845c-01.jinja2
index e8ac744a9..e11c20655 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db845c-01.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/db845c-01.jinja2
@@ -25,3 +25,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-845c', 'worker': 'pmwg-dispatcher01.pmwglab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/dragonboard-410c-01.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/dragonboard-410c-01.jinja2
index 9fc182d07..e071c5fb8 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/dragonboard-410c-01.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/dragonboard-410c-01.jinja2
@@ -20,3 +20,5 @@
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
 {% set device_ip = '10.99.0.249' %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'pmwg-server-01.pmwglab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-01.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-01.jinja2
index 5c1bc7e22..ab583f06c 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-01.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-01.jinja2
@@ -17,3 +17,5 @@
 {% set static_info = [{'board_id': 'S_NO62200001'}] %}
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'pmwg-server-01.pmwglab', 'tags': ['4k-hdmi-dongle'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-02.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-02.jinja2
index 3ddbbef46..bb778d9e1 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-02.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi6220-hikey-r2-02.jinja2
@@ -17,3 +17,5 @@
 {% set static_info = [{'board_id': 'S_NO62200010'}] %}
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'pmwg-server-01.pmwglab', 'tags': ['4k-hdmi-dongle'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-01.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-01.jinja2
index 421c92d41..52b436416 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-01.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-01.jinja2
@@ -18,3 +18,5 @@
 {% set connection_command = 'telnet pmwg-server-01 7111' %}
 {% set flash_cmds_order = ['ptable', 'fastboot', 'nvme', 'boot', 'cache', 'system', 'userdata'] %}
 {% set device_mac = '00:0e:c6:ce:d2:25' %}
+
+{% set sync_to_lava = {'device_type': 'hi960-hikey', 'worker': 'pmwg-server-01.pmwglab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-02.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-02.jinja2
index f5984dcd6..b14495e43 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-02.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/hi960-hikey-02.jinja2
@@ -18,3 +18,5 @@
 {% set connection_command = 'telnet pmwg-server-01 7112' %}
 {% set flash_cmds_order = ['ptable', 'fastboot', 'nvme', 'boot', 'cache', 'system', 'userdata'] %}
 {% set device_mac = '80:3f:5d:04:23:3e' %}
+
+{% set sync_to_lava = {'device_type': 'hi960-hikey', 'worker': 'pmwg-server-01.pmwglab', 'tags': ['lab-tests'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/mediatek-8173-01.jinja2 b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/mediatek-8173-01.jinja2
index f41711ee4..e2b6a4a57 100644
--- a/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/mediatek-8173-01.jinja2
+++ b/pmwg.validation.linaro.org/master-configs/pmwg-master.pmwglab/lava-server/dispatcher-config/devices/mediatek-8173-01.jinja2
@@ -13,3 +13,5 @@
 {% set flash_cmds_order = ['partition', 'lk', 'boot0', 'TEE1', 'TEE2',
                            'boot' ] %}
 {% set static_info = [{'board_id': 'S_NO81730000'}, {'board_id': 'S_NO81730001'}] %}
+
+{% set sync_to_lava = {'device_type': 'mediatek-8173', 'worker': 'pmwg-dispatcher01.pmwglab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-b2260-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-b2260-01.jinja2
index 354eac371..154da770c 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-b2260-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-b2260-01.jinja2
@@ -7,3 +7,5 @@
 {% set connection_commands = {'uart0': 'telnet staging01 7104'} %}
 {% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --port 13 --hostname pdu15 --command on' %}
 {% set uboot_mac_addr = '00:80:e1:12:81:30' %}
+
+{% set sync_to_lava = {'device_type': 'b2260', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-bananapi-m2-zero-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-bananapi-m2-zero-01.jinja2
index 094441dbc..4cc8500bc 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-bananapi-m2-zero-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-bananapi-m2-zero-01.jinja2
@@ -8,3 +8,5 @@
 {% set power_on_command = '/usr/local/lab-scripts/cbrxd_hub_control --usb_port 13 --mode sync -n staging02-hub02' %}
 {% set connection_command = 'telnet staging02 7113' %}
 {% set uboot_mass_storage_device = '/dev/disk/by-id/usb-Linux_UMS_disk_0_bananapi-m2-zero-02c000423b060759-0:0' %}
+
+{% set sync_to_lava = {'device_type': 'sun8i-h2-plus-bananapi-m2-zero', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black01.jinja2
index f86819847..8942eaf12 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black01.jinja2
@@ -6,3 +6,5 @@
 {% set power_off_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu15 --command off --port 12' %}
 {% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu15 --command on --port 12' %}
 {% set base_ip_args = 'ip=:::::eth0:dhcp' %}
+
+{% set sync_to_lava = {'device_type': 'beaglebone-black', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': ['am335x-boneblack']} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black03.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black03.jinja2
index eaab5ac61..337a1f096 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black03.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black03.jinja2
@@ -11,3 +11,5 @@
 {% set sysfs = {'iface0': '/sys/devices/platform/ocp/4a100000.ethernet/net/', 'iface1': '/sys/devices/platform/ocp/47400000.usb/47401c00.usb/musb-hdrc.1.auto/usb1/1-1/1-1:1.0/net/'} %}
 {% set mac_addr = {'iface0': 'c8:a0:30:c4:06:52', 'iface1': '00:50:b6:1d:73:45'} %}
 {% set base_ip_args = 'ip=:::::eth0:dhcp' %}
+
+{% set sync_to_lava = {'device_type': 'beaglebone-black', 'worker': 'staging02.lavalab', 'tags': ['vland'], 'aliases': ['am335x-boneblack']} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black04.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black04.jinja2
index 28fee77bf..649839861 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black04.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-black04.jinja2
@@ -11,3 +11,5 @@
 {% set sysfs = {'iface0': '/sys/devices/platform/ocp/4a100000.ethernet/net/', 'iface1': '/sys/devices/platform/ocp/47400000.usb/47401c00.usb/musb-hdrc.1.auto/usb1/1-1/1-1:1.0/net/'} %}
 {% set mac_addr = {'iface0': 'c4:ed:ba:7d:b0:eb', 'iface1': '00:50:b6:1d:af:5b'} %}
 {% set base_ip_args = 'ip=:::::eth0:dhcp' %}
+
+{% set sync_to_lava = {'device_type': 'beaglebone-black', 'worker': 'staging02.lavalab', 'tags': ['vland'], 'aliases': ['am335x-boneblack']} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-cubietruck01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-cubietruck01.jinja2
index 28d92b678..d8674a426 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-cubietruck01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-cubietruck01.jinja2
@@ -5,3 +5,5 @@
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set connection_commands = {'uart0': 'telnet staging03 7101'} %}
 {% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu18 --command on --port 14' %}
+
+{% set sync_to_lava = {'device_type': 'cubietruck', 'worker': 'staging03.lavalab', 'tags': [], 'aliases': ['sun7i-a20-cubietruck']} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-01.jinja2
index 66300d237..5143e552f 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-01.jinja2
@@ -26,3 +26,5 @@
 	'CHAMELIUM_REBOOT_ARG': '--hostname pdu15 --command reboot --port 4 --delay 20'
 } %}
 {# Chamelium serial is: telnet staging01 7113 #}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'staging01.lavalab', 'tags': ['static-ip', 'chamelium', 'new-firmware'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-02.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-02.jinja2
index a2649425a..d416208b3 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-02.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db410c-02.jinja2
@@ -20,3 +20,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-410c', 'worker': 'staging01.lavalab', 'tags': ['old-firmware'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db820c-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db820c-01.jinja2
index fed8ec9b2..f7c2645a7 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db820c-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db820c-01.jinja2
@@ -29,3 +29,5 @@
 'system',
 'cache',
 'userdata'] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-820c', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db845c-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db845c-01.jinja2
index 9acbfd466..0650e0cc5 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db845c-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-db845c-01.jinja2
@@ -23,3 +23,5 @@
                            'rpm', 'sbl1', 'sbl2', 'sec', 'tz', 'aboot',
                            'boot', 'rootfs', 'vendor', 'system', 'cache',
                            'userdata', ] %}
+
+{% set sync_to_lava = {'device_type': 'dragonboard-845c', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-disco-l475-iot1-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-disco-l475-iot1-01.jinja2
index b2d3966b0..2a2404c27 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-disco-l475-iot1-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-disco-l475-iot1-01.jinja2
@@ -4,3 +4,5 @@
 {% set board_id = '066CFF323535474B43125130' %}
 {% set device_info = [{'board_id': '066CFF323535474B43125130'}] %}
 {% set usb_mass_device = "/dev/disk/by-id/usb-MBED_microcontroller_066CFF323535474B43125130-0:0" %}
+
+{% set sync_to_lava = {'device_type': 'disco-l475-iot1', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-01.jinja2
index c431e6a77..930a42970 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-01.jinja2
@@ -7,3 +7,5 @@
 {% set connection_tags = {'usb0': ['primary', 'telnet']} %}
 {% set connection_commands = {'usb0': 'telnet staging02 7106'} %}
 {% set usb_sleep = 5 %}
+
+{% set sync_to_lava = {'device_type': 'frdm-k64f', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-02.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-02.jinja2
index ffa86b8df..fdd3b8f97 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-02.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-k64f-02.jinja2
@@ -7,3 +7,5 @@
 {% set connection_tags = {'usb0': ['primary', 'telnet']} %}
 {% set connection_commands = {'usb0': 'telnet localhost 7101'} %}
 {% set usb_sleep = 5 %}
+
+{% set sync_to_lava = {'device_type': 'frdm-k64f', 'worker': 'staging-m01', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-01.jinja2
index 5fee76382..5790c2726 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-01.jinja2
@@ -5,3 +5,5 @@
 {% set connection_list = ['usb0'] %}
 {% set connection_tags = {'usb0': ['primary', 'telnet']} %}
 {% set connection_commands = {'usb0': 'telnet staging02 7110'} %}
+
+{% set sync_to_lava = {'device_type': 'frdm-kw41z', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-02.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-02.jinja2
index c70e4aeb6..f5b79e6c2 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-02.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-frdm-kw41z-02.jinja2
@@ -5,3 +5,5 @@
 {% set connection_list = ['usb0'] %}
 {% set connection_tags = {'usb0': ['primary', 'telnet']} %}
 {% set connection_commands = {'usb0': 'telnet staging01 7107'} %}
+
+{% set sync_to_lava = {'device_type': 'frdm-kw41z', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-bl-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-bl-01.jinja2
index 9b8cb8a54..c9e7cb5cf 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-bl-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-bl-01.jinja2
@@ -34,3 +34,5 @@
 '/usr/local/lab-scripts/eth008_control -a 10.0.9.6 -r 8 -s off',
 '/usr/local/lab-scripts/eth008_control -a 10.0.9.6 -r 7 -s on'] %}
 {% set action_timeout_power_off = 60 %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-bl', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-01.jinja2
index 562c5d874..d6b7eb27c 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-01.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.7.0.49" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'staging02.lavalab', 'tags': ['static-ip', '4k-hdmi-dongle', 'sd-card'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-02.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-02.jinja2
index 675ca7095..3149709d3 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-02.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-02.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.7.0.85" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'staging02.lavalab', 'tags': ['static-ip', '4k-hdmi-dongle', 'sd-card'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-03.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-03.jinja2
index dfef05f9e..76fc23461 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-03.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-03.jinja2
@@ -19,3 +19,5 @@
 {% set static_info = [{'board_id': 'S_NO18011601'}] %}
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'staging02.lavalab', 'tags': ['arm-energy-probe', '4k-hdmi-dongle', 'sd-card'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-04.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-04.jinja2
index 554821e51..3a1fe56fd 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-04.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-04.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.7.0.63" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'staging02.lavalab', 'tags': ['static-ip', '4k-hdmi-dongle', 'sd-card'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-05.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-05.jinja2
index cdcc6798f..5a16f1629 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-05.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-05.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.7.0.87" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'staging03.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-06.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-06.jinja2
index db72719b9..6af39e01e 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-06.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi6220-hikey-r2-06.jinja2
@@ -19,3 +19,5 @@
 {% set interrupt_prompt = 'Android Fastboot mode' %}
 {% set interrupt_string = "' '" %}
 {% set device_ip = "10.7.0.88" %}
+
+{% set sync_to_lava = {'device_type': 'hi6220-hikey-r2', 'worker': 'staging03.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi960-hikey-02.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi960-hikey-02.jinja2
index fedd1f6bb..62e974f99 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi960-hikey-02.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-hi960-hikey-02.jinja2
@@ -18,3 +18,5 @@
 {% set connection_command = 'telnet staging02 7111' %}
 {% set flash_cmds_order = ['ptable', 'fastboot', 'nvme', 'boot', 'cache', 'system', 'userdata'] %}
 {% set device_mac = '80:3f:5d:09:5e:6a' %}
+
+{% set sync_to_lava = {'device_type': 'hi960-hikey', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx7s-warp-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx7s-warp-01.jinja2
index 841d9a898..a129ce94c 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx7s-warp-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx7s-warp-01.jinja2
@@ -5,3 +5,5 @@
 {% set power_on_command = '/usr/local/lab-scripts/cbrxd_hub_control --usb_port 15 --mode sync -n staging01-hub01' %}
 {% set connection_command = 'telnet serial4 7006' %}
 {% set uboot_mass_storage_device = '/dev/disk/by-id/usb-Linux_UMS_disk_0_WaRP7-0x742400d3000000e6-0:0' %}
+
+{% set sync_to_lava = {'device_type': 'imx7s-warp', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx8mq-evk-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx8mq-evk-01.jinja2
index 694485420..c0ea2723c 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx8mq-evk-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-imx8mq-evk-01.jinja2
@@ -20,3 +20,5 @@
 {% set uboot_mass_storage_device = '/dev/disk/by-id/usb-Linux_UMS_disk_0_021069d6f32ef628-0:0' %}
 {% set fastboot_serial_number = '021069d6f32ef628' %}
 
+
+{% set sync_to_lava = {'device_type': 'imx8mq-evk', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-juno-r2-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-juno-r2-01.jinja2
index 8aa6a5b71..3aed48ddc 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-juno-r2-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-juno-r2-01.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.15.134.166' %}
 {% set device_mac = '00:02:f7:00:68:14' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x68,0x14' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lces2-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lces2-01.jinja2
index f4048f841..892471eb6 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lces2-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lces2-01.jinja2
@@ -37,3 +37,5 @@
                                   'sleep 1',
                                   '/usr/local/lab-scripts/flashing_command -l "{LAYOUT}" -i "{IMAGE}" -t /dev/disk/by-id/usb-Signum_SDW_E_HS-SD_MMC_DEADBEEF0009-0:0',
                                   '/usr/local/bin/sd-mux-ctrl -e sdw-09 --dut'] %}
+
+{% set sync_to_lava = {'device_type': 'rzn1d', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc01.jinja2
index a5fb37e96..c0e318aaf 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc01.jinja2
@@ -1 +1,3 @@
 {% extends 'lxc.jinja2' %}
+
+{% set sync_to_lava = {'device_type': 'lxc', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc02.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc02.jinja2
index a5fb37e96..36c2edc32 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc02.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc02.jinja2
@@ -1 +1,3 @@
 {% extends 'lxc.jinja2' %}
+
+{% set sync_to_lava = {'device_type': 'lxc', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc03.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc03.jinja2
index a5fb37e96..c0e318aaf 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc03.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc03.jinja2
@@ -1 +1,3 @@
 {% extends 'lxc.jinja2' %}
+
+{% set sync_to_lava = {'device_type': 'lxc', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc04.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc04.jinja2
index a5fb37e96..36c2edc32 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc04.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-lxc04.jinja2
@@ -1 +1,3 @@
 {% extends 'lxc.jinja2' %}
+
+{% set sync_to_lava = {'device_type': 'lxc', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-minnow-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-minnow-01.jinja2
index f72a5899a..3ee59a4b7 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-minnow-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-minnow-01.jinja2
@@ -7,3 +7,5 @@
 {% set hard_reset_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu18 --command reboot --port 15' %}
 {% set power_off_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu18 --command off --port 15' %}
 {% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu18 --command on --port 15' %}
+
+{% set sync_to_lava = {'device_type': 'minnowboard-turbot-E3826', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus10-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus10-01.jinja2
index 896327a98..09f520dd1 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus10-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus10-01.jinja2
@@ -4,3 +4,5 @@
 {% set device_info = [{'board_id': 'R32D300FRYP'}] %}
 {% set flash_cmds_order = ['update', 'ptable', 'partition', 'cache',
    'userdata', 'system'] %}
+
+{% set sync_to_lava = {'device_type': 'nexus10', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus5x-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus5x-01.jinja2
index 0005534e3..f6919ab07 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus5x-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nexus5x-01.jinja2
@@ -6,3 +6,5 @@
 {% set static_info = [{'board_id': '00f31e3012ca3c76'}] %}
 {% set fastboot_options = [] %}
 {% set flash_cmds_order = ['update', 'ptable', 'partition', 'cache', 'userdata', 'system', 'vendor'] %}
+
+{% set sync_to_lava = {'device_type': 'nexus5x', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nucleo-64-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nucleo-64-01.jinja2
index 8f259833b..31e65652d 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nucleo-64-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-nucleo-64-01.jinja2
@@ -4,3 +4,5 @@
 {% set connection_list = ['usb0'] %}
 {% set connection_tags = {'usb0': ['primary', 'telnet']} %}
 {% set connection_commands = {'usb0': 'telnet staging02 7109'} %}
+
+{% set sync_to_lava = {'device_type': 'nucleo-l476rg', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-pixel-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-pixel-01.jinja2
index 614c10d17..63b96e09d 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-pixel-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-pixel-01.jinja2
@@ -11,3 +11,5 @@
 'system_a',
 'system_b',
 'vendor'] %}
+
+{% set sync_to_lava = {'device_type': 'pixel', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu01.jinja2
index 0e63520d2..56497f31c 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu01.jinja2
@@ -3,3 +3,5 @@
 {% set memory = 1024 %}
 {% set netdevice = netdevice|default('tap') %}
 
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'staging01.lavalab', 'tags': ['bigmem'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu02.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu02.jinja2
index 615a9b7c4..0467c227b 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu02.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu02.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'DE:AD:BE:EF:32:02' %}
 {% set memory = 1024 %}
 {% set netdevice = netdevice|default('tap') %}
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu03.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu03.jinja2
index 74ed6fea0..8588e3fd0 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu03.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu03.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'DE:AD:BE:EF:32:03' %}
 {% set memory = 1024 %}
 {% set netdevice = netdevice|default('tap') %}
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu04.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu04.jinja2
index 9adc5831a..a25c3176c 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu04.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-qemu04.jinja2
@@ -2,3 +2,5 @@
 {% set mac_addr = 'DE:AD:BE:EF:32:04' %}
 {% set memory = 1024 %}
 {% set netdevice = netdevice|default('tap') %}
+
+{% set sync_to_lava = {'device_type': 'qemu', 'worker': 'staging02.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-rpi3-b-32-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-rpi3-b-32-01.jinja2
index d9401d772..cdad2f692 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-rpi3-b-32-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-rpi3-b-32-01.jinja2
@@ -8,3 +8,5 @@
 {% set connection_list = ['uart0'] %}
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set connection_commands = {'uart0': 'telnet staging01 7108'} %}
+
+{% set sync_to_lava = {'device_type': 'bcm2837-rpi-3-b-32', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-soca9-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-soca9-01.jinja2
index 8ee0ec4f3..da123648f 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-soca9-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-soca9-01.jinja2
@@ -30,3 +30,5 @@
 {% set bootz_kernel_addr = "0x84000000" %}
 {% set bootz_ramdisk_addr = "0x80100000" %}
 {% set bootz_dtb_addr = "0x80f00000" %}
+
+{% set sync_to_lava = {'device_type': 'soca9', 'worker': 'staging03.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-stm32mp157-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-stm32mp157-01.jinja2
index 67303a047..bdf08f94b 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-stm32mp157-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-stm32mp157-01.jinja2
@@ -18,3 +18,5 @@
 '/usr/local/lab-scripts/eth008_control -a 10.0.9.2 -r 1 -s off',
 '/usr/local/lab-scripts/eth008_control -a 10.0.9.2 -r 2 -s off',
 '/usr/local/lab-scripts/snmp_pdu_control --hostname pdu18 --command on --port 23'] %}
+
+{% set sync_to_lava = {'device_type': 'stm32mp157c-dk2', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-01.jinja2
index 7fbbed550..b04cbd048 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-01.jinja2
@@ -30,3 +30,5 @@
 'system',
 'cache',
 'userdata'] %}
+
+{% set sync_to_lava = {'device_type': 'x15', 'worker': 'staging03.lavalab', 'tags': ['lcd'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-bl-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-bl-01.jinja2
index 355b21523..145117741 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-bl-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x15-bl-01.jinja2
@@ -61,3 +61,5 @@
                         'sd_to_ts': {'do': '/usr/local/bin/sd-mux-ctrl -e sdw-04 --ts',
                                      'undo': '/usr/local/bin/sd-mux-ctrl -e sdw-04 --dut'}
 } %}
+
+{% set sync_to_lava = {'device_type': 'x15-bl', 'worker': 'staging03.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x86-01.jinja2 b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x86-01.jinja2
index e33394840..4484f8967 100644
--- a/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x86-01.jinja2
+++ b/staging.validation.linaro.org/master-configs/staging-master.lavalab/lava-server/dispatcher-config/devices/staging-x86-01.jinja2
@@ -5,3 +5,5 @@
 {% set connection_tags = {'uart0': ['primary', 'telnet']} %}
 {% set connection_commands = {'uart0': 'telnet serial4 7015'} %}
 {% set power_on_command = '/usr/local/lab-scripts/snmp_pdu_control --port 5 --hostname pdu15 --command on' %}
+
+{% set sync_to_lava = {'device_type': 'x86', 'worker': 'staging01.lavalab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-01.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-01.jinja2
index c71942d05..bc646e967 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-01.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-01.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.21' %}
 {% set device_mac = '00:02:f7:00:58:af' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x58,0xaf' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r0'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-02.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-02.jinja2
index 3f3e5b7b3..596ef8294 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-02.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-02.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.22' %}
 {% set device_mac = '00:02:f7:00:59:7b' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x59,0x7b' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r0'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-03.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-03.jinja2
index ae99e1623..e99789cb3 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-03.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-03.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.23' %}
 {% set device_mac = '00:02:f7:00:58:0d' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x58,0x0d' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r0'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-04.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-04.jinja2
index 514abfcda..f0bcb906d 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-04.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-04.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.24' %}
 {% set device_mac = '00:02:f7:00:58:7b' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x58,0x7b' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r0'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-05.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-05.jinja2
index 6cc561a55..2b16ec377 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-05.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r0-05.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.25' %}
 {% set device_mac = '00:02:f7:00:58:37' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x58,0x37' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r0'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r1-01.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r1-01.jinja2
index f77b0f194..100845f0c 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r1-01.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r1-01.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.30' %}
 {% set device_mac = '00:02:f7:00:61:5b' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x61,0x5b' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r1'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
index 9c86982b3..0a2f84fb5 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-01.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.10' %}
 {% set device_mac = '00:02:f7:00:66:5d' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x66,0x5d' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r2'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2
index 250c39565..8b4ae5855 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-02.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.11' %}
 {% set device_mac = '00:02:f7:00:75:e3' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x75,0xE3' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r2'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2
index c31db0c80..150a7665b 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/juno-r2-03.jinja2
@@ -10,3 +10,5 @@
 {% set device_ip = '10.88.18.12' %}
 {% set device_mac = '00:02:f7:00:68:3d' %}
 {% set vexpress_sky2_mac = '0x00,0x02,0xF7,0x00,0x68,0x3d' %}
+
+{% set sync_to_lava = {'device_type': 'juno', 'worker': 'tf-master.tflab', 'tags': ['r2'], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-01.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-01.jinja2
index 144adc70d..9cb4a456a 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-01.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-01.jinja2
@@ -27,3 +27,5 @@
                                   'sleep 1',
                                   '/usr/local/bin/sd-mux-ctrl -e 000000000331 --dut',
                                   'sleep 5'] %}
+
+{% set sync_to_lava = {'device_type': 'mps', 'worker': 'tf-master.tflab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-02.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-02.jinja2
index b8eee8480..6723541c7 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-02.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-02.jinja2
@@ -27,3 +27,5 @@
                                   'sleep 1',
                                   '/usr/local/bin/sd-mux-ctrl -e 000000000356 --dut',
                                   'sleep 5'] %}
+
+{% set sync_to_lava = {'device_type': 'mps', 'worker': 'tf-master.tflab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-03.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-03.jinja2
index 16ba85b0a..b7849e58d 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-03.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-03.jinja2
@@ -27,3 +27,5 @@
                                   'sleep 1',
                                   '/usr/local/bin/sd-mux-ctrl -e 000000000301 --dut',
                                   'sleep 5'] %}
+
+{% set sync_to_lava = {'device_type': 'mps', 'worker': 'tf-master.tflab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
diff --git a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-04.jinja2 b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-04.jinja2
index a713a8c51..3e2c2142d 100644
--- a/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-04.jinja2
+++ b/tf.validation.linaro.org/master-configs/tf-master.tflab/lava-server/dispatcher-config/devices/mps2-04.jinja2
@@ -27,3 +27,5 @@
                                   'sleep 1',
                                   '/usr/local/bin/sd-mux-ctrl -e 000000000394 --dut',
                                   'sleep 5'] %}
+
+{% set sync_to_lava = {'device_type': 'mps', 'worker': 'tf-master.tflab', 'tags': [], 'aliases': []} %}
+\ No newline at end of file
author	Milosz Wasilewski <milosz.wasilewski@linaro.org>	2020-08-11 15:55:25 +0100
committer	Dave Pigott <dave.pigott@linaro.org>	2020-08-18 11:08:42 +0000
commit	c6ad64af0ab92b8a8c741f88b9b804b83d48ab13 (patch)
tree	3f28e4928999fcead129cb56e0aa8f6e41f4b6ee
parent	10dfa00281b6c6ed0f8f122d2c8df981c06956ce (diff)