canonical-hw-cert team mailing list archive
-
canonical-hw-cert team
-
Mailing list archive
-
Message #187124
[Merge] cc-tool-box:modify_dawson_configs into cc-tool-box:master
Nancy Chen has proposed merging cc-tool-box:modify_dawson_configs into cc-tool-box:master.
Commit message:
Add advertised_queues and advertised_images for previous lab 4 devices (dawson-003, 202102-28727, 202106-29206, 202106-29207, 202005-27899, 201801-26082, rpi400-002, rpicm4l)
Requested reviews:
Canonical Hardware Certification (canonical-hw-cert)
For more details, see:
https://code.launchpad.net/~canonical-hw-cert/cc-tool-box/+git/cc-tool-box/+merge/457753
--
Your team Canonical Hardware Certification is requested to review the proposed merge of cc-tool-box:modify_dawson_configs into cc-tool-box:master.
diff --git a/config/cc_lab_manager/device_config_maptable.py b/config/cc_lab_manager/device_config_maptable.py
index e889c23..555f2e5 100644
--- a/config/cc_lab_manager/device_config_maptable.py
+++ b/config/cc_lab_manager/device_config_maptable.py
@@ -123,11 +123,6 @@ agent_config_platform_maptable = {
'capilano-qed': {
'recovery_cmds': [
'sudo snap reboot --install']
- },
- 'dawson-003':{
- 'recovery_cmds': [
- 'echo 5 | sudo tee /sys/class/tpm/tpm0/ppi/request',
- 'sudo snap reboot --install']
}
}
@@ -392,6 +387,11 @@ agent_config_device_maptable = {
"ZAPPER_IP": "10.102.160.184",
},
},
+ 'dawson-003':{
+ 'recovery_cmds': [
+ 'echo 5 | sudo tee /sys/class/tpm/tpm0/ppi/request',
+ 'sudo snap reboot --install']
+ }
}
tf_config_platform_maptable = {
@@ -407,12 +407,8 @@ tf_config_platform_maptable = {
'core18-stable-armhf': 'url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz',
'core20-armhf-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-armhf+raspi.img.xz',
'core20-arm64-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-arm64+raspi.img.xz',
- 'server-18.04.5-arm64': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-arm64+raspi3.img.xz',
- 'server-18.04.5-armhf': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz',
'server-20.04.4-arm64': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-arm64+raspi.img.xz',
- 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz',
- 'server-21.10-arm64': 'url: http://cdimage.ubuntu.com/releases/impish/release/ubuntu-21.10-preinstalled-desktop-arm64+raspi.img.xz',
- 'server-21.10-armhf': 'url: http://cdimage.ubuntu.com/releases/21.10/release/ubuntu-21.10-preinstalled-server-armhf+raspi.img.xz'
+ 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz'
}
}
},
@@ -426,12 +422,8 @@ tf_config_platform_maptable = {
'core18-stable-armhf': 'url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz',
'core20-armhf-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-armhf+raspi.img.xz',
'core20-arm64-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-arm64+raspi.img.xz',
- 'server-18.04.5-arm64': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-arm64+raspi3.img.xz',
- 'server-18.04.5-armhf': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz',
'server-20.04.4-arm64': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-arm64+raspi.img.xz',
- 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz',
- 'server-21.10-arm64': 'url: http://cdimage.ubuntu.com/releases/impish/release/ubuntu-21.10-preinstalled-desktop-arm64+raspi.img.xz',
- 'server-21.10-armhf': 'url: http://cdimage.ubuntu.com/releases/21.10/release/ubuntu-21.10-preinstalled-server-armhf+raspi.img.xz'
+ 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz'
}
}
},
@@ -445,12 +437,8 @@ tf_config_platform_maptable = {
'core18-stable-armhf': 'url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz',
'core20-armhf-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-armhf+raspi.img.xz',
'core20-arm64-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-arm64+raspi.img.xz',
- 'server-18.04.5-arm64': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-arm64+raspi3.img.xz',
- 'server-18.04.5-armhf': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz',
'server-20.04.4-arm64': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-arm64+raspi.img.xz',
- 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz',
- 'server-21.10-arm64': 'url: http://cdimage.ubuntu.com/releases/impish/release/ubuntu-21.10-preinstalled-desktop-arm64+raspi.img.xz',
- 'server-21.10-armhf': 'url: http://cdimage.ubuntu.com/releases/21.10/release/ubuntu-21.10-preinstalled-server-armhf+raspi.img.xz'
+ 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz'
}
}
},
@@ -464,12 +452,8 @@ tf_config_platform_maptable = {
'core18-stable-armhf': 'url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz',
'core20-armhf-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-armhf+raspi.img.xz',
'core20-arm64-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-arm64+raspi.img.xz',
- 'server-18.04.5-arm64': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-arm64+raspi3.img.xz',
- 'server-18.04.5-armhf': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz',
'server-20.04.4-arm64': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-arm64+raspi.img.xz',
- 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz',
- 'server-21.10-arm64': 'url: http://cdimage.ubuntu.com/releases/impish/release/ubuntu-21.10-preinstalled-desktop-arm64+raspi.img.xz',
- 'server-21.10-armhf': 'url: http://cdimage.ubuntu.com/releases/21.10/release/ubuntu-21.10-preinstalled-server-armhf+raspi.img.xz'
+ 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz'
}
}
},
@@ -483,12 +467,9 @@ tf_config_platform_maptable = {
'core18-stable-armhf': 'url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz',
'core20-armhf-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-armhf+raspi.img.xz',
'core20-arm64-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-arm64+raspi.img.xz',
- 'server-18.04.5-arm64': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-arm64+raspi3.img.xz',
- 'server-18.04.5-armhf': 'url: http://cdimage.ubuntu.com/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz',
'server-20.04.4-arm64': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-arm64+raspi.img.xz',
- 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz',
- 'server-21.10-arm64': 'url: http://cdimage.ubuntu.com/releases/impish/release/ubuntu-21.10-preinstalled-desktop-arm64+raspi.img.xz',
- 'server-21.10-armhf': 'url: http://cdimage.ubuntu.com/releases/21.10/release/ubuntu-21.10-preinstalled-server-armhf+raspi.img.xz'
+ 'server-20.04.4-armhf': 'url: http://cdimage.ubuntu.com/releases/focal/release/ubuntu-20.04.4-preinstalled-server-armhf+raspi.img.xz'
+
}
}
},
@@ -501,7 +482,29 @@ tf_config_platform_maptable = {
'ubuntu-20220620': 'url: {File_Server}/riscv/starfive/visionfive/disk-uefi.ext4.xz'
}
}
- }
+ },
+ 'rpicm4l': {
+ 'advertised_queues': {
+ 'rpicm4l': 'Raspberry Pi Compute Module 4 Lite'
+ },
+ 'advertised_images': {
+ 'rpicm4l': {
+ 'core20-armhf-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-armhf+raspi.img.xz',
+ 'core20-arm64-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-arm64+raspi.img.xz'
+ }
+ }
+ },
+ 'rpi400': {
+ 'advertised_queues': {
+ 'rpi400': 'Raspberry Pi 400'
+ },
+ 'advertised_images': {
+ 'rpi400': {
+ 'core20-armhf-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-armhf+raspi.img.xz',
+ 'core20-arm64-beta': 'url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-beta/pending/ubuntu-core-20-arm64+raspi.img.xz'
+ }
+ }
+ },
}
tf_config_device_maptable = {
@@ -538,12 +541,76 @@ tf_config_device_maptable = {
'job_queues':['{CID}','{Device_ID}']
},
'dawson-003': {
- 'job_queues':['{CID}','{Device_ID}']
+ 'job_queues':['{CID}','{Device_ID}'],
+ 'advertised_queues': {
+ 'dawson-i-uc20-fde': 'Dawson-i NUC for UC20 secure-boot/full-disk encryption testing'
+ },
+ 'advertised_images': {
+ 'dawson-i-uc20-fde': {
+ 'core20': 'distro: core20'
+ }
+ }
},
'dawson-004': {
'job_queues':['{CID}','{Device_ID}']
},
'dawson-005': {
'job_queues':['{CID}','{Device_ID}']
+ },
+ 'hp-elitebook-830-g8-notebook-pc-c29206': {
+ 'advertised_queues': {
+ '202106-29206': 'HP EliteBook 830 G8 Notebook PC (16 GB) - Corvette13, Core i7-1185G7 CPU, Intel 8086:a0f0 WiFi'
+ },
+ 'advertised_images': {
+ '202106-29206': {
+ 'oem-focal': 'distro: stella-focal-X00-20210826-1655',
+ 'desktop-focal': 'distro: desktop-20-04-2-uefi'
+ }
+ }
+ },
+ 'hp-elitebook-830-g8-notebook-pc-c29207': {
+ 'advertised_queues': {
+ '202106-29207': 'HP EliteBook 830 G8 Notebook PC (64 GB) - Corvette13, Core i7-1185G7 CPU, Intel 8086:a0f0 WiFi'
+ },
+ 'advertised_images': {
+ '202106-29207': {
+ 'oem-focal': 'distro: stella-focal-X00-20210826-1655',
+ 'desktop-focal': 'distro: desktop-20-04-2-uefi'
+ }
+ }
+ },
+ 'hp-z2-sff-g8-workstation-c28727': {
+ 'advertised_queues': {
+ '202102-28727': 'HP Z2 SFF G8 Workstation - Saturn, Intel i9-11900 CPU, Intel 8086:43f0 WiFi'
+ },
+ 'advertised_images': {
+ '202102-28727': {
+ 'oem-focal': 'distro: stella-focal-X00-20210826-1655',
+ 'desktop-focal': 'distro: desktop-20-04-2-uefi'
+ }
+ }
+ },
+ 'hp-proone600-g6-aio-c27899': {
+ 'advertised_queues': {
+ '202005-27899': 'HP ProOne 600 G6 AiO - Bran, Intel Core i7-10700T CPU, Intel - 8086:06f0 WiFi'
+ },
+ 'advertised_images': {
+ '202005-27899': {
+ 'oem-focal': 'distro: stella-focal-X00-20210826-1655',
+ 'desktop-focal': 'distro: desktop-20-04-2-uefi'
+ }
+ }
+ },
+ 'dell-g7-7588-c26082': {
+ 'advertised_queues': {
+ '201801-26082': 'Dell G7 7588 - Firestar B 15, Qualcomm Atheros - 168c:003e, Core i9-8950HK'
+ },
+ 'advertised_images': {
+ '201801-26082': {
+ 'focal': 'distro: focal',
+ 'desktop-focal-amd64': 'distro: desktop-20-04-1-uefi'
+
+ }
+ }
}
}
