← Back to team overview

canonical-hw-cert team mailing list archive

[Merge] ~kevinyeh/cc-tool-box:revert-2f7d548 into cc-tool-box:master

 

Kevin Yeh has proposed merging ~kevinyeh/cc-tool-box:revert-2f7d548 into cc-tool-box:master.

Commit message:
Revert "Custom testflinger device configs for 15 devices setup with Zapper"

Requested reviews:
  Canonical Hardware Certification (canonical-hw-cert)

For more details, see:
https://code.launchpad.net/~kevinyeh/cc-tool-box/+git/cc-tool-box/+merge/463810
-- 
Your team Canonical Hardware Certification is requested to review the proposed merge of ~kevinyeh/cc-tool-box:revert-2f7d548 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 a28931f..2dca4e5 100644
--- a/config/cc_lab_manager/device_config_maptable.py
+++ b/config/cc_lab_manager/device_config_maptable.py
@@ -161,261 +161,6 @@ agent_config_device_maptable = {
         'reboot_script': [
             'ssh -t -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null admin@{Controller_IP} racadm serveraction powercycle']
     },
-    "hp-elite-tower-680-g9-pci-desktop-pc-c31644": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "WgekteRPERpwqD5iMCqqEg",
-            "CID": "202306-31644",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.152.131",
-            "ZAPPER_IP": "10.102.152.132",
-        },
-    },
-    "advantech-som-5899-c29906": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "zaqBLTmyJAhweJRx5CWMPK",
-            "CID": "202201-29906",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.162.65",
-            "ZAPPER_IP": "10.102.162.66",
-        },
-    },
-    "adlink-i-pi-smarc-elkhart-lake-c31051": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "ewPVPqDussXEb8JR2fdj4f",
-            "CID": "202212-31051",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.163.151",
-            "ZAPPER_IP": "10.102.163.152",
-        },
-    },
-    "advantech-ita-460-c30165": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "sCxzRUP7TzKS2m83mZE9dN",
-            "CID": "202204-30165",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.161.195",
-            "ZAPPER_IP": "10.102.161.196",
-        },
-    },
-    "advantech-ei-52-c29878": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "oaWuYGfihLzPNPUq7xzkXU",
-            "CID": "202201-29878",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.161.63",
-            "ZAPPER_IP": "10.102.161.64",
-        },
-    },
-    "advantech-uno-420-c29205": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "94wAjaRLfoRpEwBSjA4CXZ",
-            "CID": "202106-29205",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.153.101",
-            "ZAPPER_IP": "10.102.153.102",
-        },
-    },
-    "dell-xps-9320-c31085": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "4RADYDCYetyQJfWxyKJC8D",
-            "CID": "202301-31085",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.154.243",
-            "ZAPPER_IP": "10.102.154.244",
-        },
-    },
-    "hp-z8-fury-g5-workstation-c32164": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "VGvGfAUXHLCwiVPpG5bnme",
-            "CID": "202310-32164",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.154.219",
-            "ZAPPER_IP": "10.102.154.220",
-        },
-    },
-    "dell-optiplex-xe4-c31521": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "YriUaZfyMUs3QBgvxV6C9h",
-            "CID": "202304-31521",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.154.169",
-            "ZAPPER_IP": "10.102.154.170",
-        },
-    },
-    "dell-precision-3660-c30631": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "BPe5qbaPsG4zGtAt6GUWt2",
-            "CID": "202209-30631",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.153.203",
-            "ZAPPER_IP": "10.102.153.204",
-        },
-    },
-    "lenovo-thinkstation-p350-tower--sff-c28696": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "QbZNe6VTEaqMVb5Mhx8fT6",
-            "CID": "202102-28696",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.160.227",
-            "ZAPPER_IP": "10.102.160.228",
-        },
-    },
-    "dell-precision-5680-c31322": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "T3cG729zFC4oxixmYhNwyt",
-            "CID": "202303-31322",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.154.135",
-            "ZAPPER_IP": "10.102.154.136",
-        },
-    },
-    "hp-elitebook-630-133-inch-g10-notebook-pc-c31240": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "kHhZ3TLadJdQccTvF8K48M",
-            "CID": "202302-31240",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.154.73",
-            "ZAPPER_IP": "10.102.154.74",
-        },
-    },
-    "hp-probook-450-156-inch-g10-notebook-pc-c31135": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "KqhE9ow5FsZRUEXGMS3tVG",
-            "CID": "202301-31135",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.154.251",
-            "ZAPPER_IP": "10.102.154.252",
-        },
-    },
-    "hp-zbook-studio-160-inch-g9-mobile-workstation-pc-c29865": {
-        "env": {
-            "HEXR_DEVICE_SECURE_ID": "s5hmBBTjMsBD6Hkk8rqX9i",
-            "CID": "202201-29865",
-            "WPA_BG_SSID": "ubuntu-cert-bg-wpa-tpelab",
-            "WPA_BG_PSK": "insecure",
-            "WPA_N_SSID": "ubuntu-cert-n-wpa-tpelab",
-            "WPA_N_PSK": "insecure",
-            "WPA_AC_SSID": "ubuntu-cert-ac-wpa-tpelab",
-            "WPA_AC_PSK": "insecure",
-            "OPEN_BG_SSID": "ubuntu-cert-bg-open-tpelab",
-            "OPEN_N_SSID": "ubuntu-cert-n-open-tpelab",
-            "OPEN_AC_SSID": "ubuntu-cert-ac-open-tpelab",
-            "DEVICE_IP": "10.102.160.183",
-            "ZAPPER_IP": "10.102.160.184",
-        },
-    },
     'dawson-003':{
         'recovery_cmds': [
             'echo 5 | sudo tee /sys/class/tpm/tpm0/ppi/request',
@@ -528,7 +273,7 @@ agent_config_device_maptable = {
             "COMPANION_HOST_IP": "10.102.153.1",
             "ZAPPER_IP": "10.102.233.19",
         },
-    },
+    }
 }
 
 tf_config_platform_maptable = {