← Back to team overview

canonical-hw-cert team mailing list archive

[Merge] ~kevinyeh/hwcert-jenkins-jobs:update-ssids into hwcert-jenkins-jobs:master

 

Kevin Yeh has proposed merging ~kevinyeh/hwcert-jenkins-jobs:update-ssids into hwcert-jenkins-jobs:master.

Commit message:
update SSIDs for all checkbox configs because naming rules is changed.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~kevinyeh/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/427792
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~kevinyeh/hwcert-jenkins-jobs:update-ssids into hwcert-jenkins-jobs:master.
diff --git a/jobs/snap-testing/configs/checkbox.conf b/jobs/snap-testing/configs/checkbox.conf
index 1f12394..e08df86 100644
--- a/jobs/snap-testing/configs/checkbox.conf
+++ b/jobs/snap-testing/configs/checkbox.conf
@@ -3,18 +3,18 @@
         WIFI_INTERFACE =
         WATCHDOG_KERNEL_MOD = iTCO_wdt
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         WPA_AC_PSK = insecure
-        WPA_AX_SSID = ubuntu-cert-ax-wpa
+        WPA_AX_SSID = cert-ax-wpa-tel-l3-01
         WPA_AX_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
-        OPEN_AX_SSID = ubuntu-cert-ax-open
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
+        OPEN_AX_SSID = cert-ax-open-tel-l3-01
         TRANSFER_SERVER = cdimage.ubuntu.com
         TEST_TARGET_IPERF = 10.101.48.243
         OBEX_TARGET = 00:02:72:3E:83:D6
diff --git a/jobs/snap-testing/configs/checkbox.conf.caracalla b/jobs/snap-testing/configs/checkbox.conf.caracalla
index ef3874d..2d1a340 100644
--- a/jobs/snap-testing/configs/checkbox.conf.caracalla
+++ b/jobs/snap-testing/configs/checkbox.conf.caracalla
@@ -3,15 +3,15 @@
         WIFI_INTERFACE = wlan0
         WATCHDOG_KERNEL_MOD = iTCO_wdt
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         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
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
         TRANSFER_SERVER = cdimage.ubuntu.com
         #TEST_TARGET_IPERF = 10.101.48.219
         TEST_TARGET_IPERF = 10.101.48.243
diff --git a/jobs/snap-testing/configs/checkbox.conf.conroe b/jobs/snap-testing/configs/checkbox.conf.conroe
index 0a46320..ef443aa 100644
--- a/jobs/snap-testing/configs/checkbox.conf.conroe
+++ b/jobs/snap-testing/configs/checkbox.conf.conroe
@@ -1,12 +1,12 @@
 # Please keep the indents below, for yaml formatting/templating
         [environment]
         WIFI_INTERFACE=wlan0
-        OPEN_N_SSID=ubuntu-cert-n-open-tpelab
-        OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
-        OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
-        WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
-        WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
-        WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+        OPEN_N_SSID=cert-n-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_N_PSK=insecure
         WPA_BG_PSK=insecure
         WPA_AC_PSK=insecure
diff --git a/jobs/snap-testing/configs/checkbox.conf.fortknox b/jobs/snap-testing/configs/checkbox.conf.fortknox
index 6c9aaec..82047c4 100644
--- a/jobs/snap-testing/configs/checkbox.conf.fortknox
+++ b/jobs/snap-testing/configs/checkbox.conf.fortknox
@@ -1,12 +1,12 @@
 # Please keep the indents below, for yaml formatting/templating
         [environment]
         WIFI_INTERFACE=wlan0
-        OPEN_N_SSID=ubuntu-cert-n-open-tpelab
-        OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
-        OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
-        WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
-        WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
-        WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+        OPEN_N_SSID=cert-n-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_N_PSK=insecure
         WPA_BG_PSK=insecure
         WPA_AC_PSK=insecure
diff --git a/jobs/snap-testing/configs/checkbox.conf.kassel b/jobs/snap-testing/configs/checkbox.conf.kassel
index d2b027c..5d8b972 100644
--- a/jobs/snap-testing/configs/checkbox.conf.kassel
+++ b/jobs/snap-testing/configs/checkbox.conf.kassel
@@ -4,18 +4,18 @@
         WIFI_INTERFACE =
         WATCHDOG_KERNEL_MOD = iTCO_wdt
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         WPA_AC_PSK = insecure
-        WPA_AX_SSID = ubuntu-cert-ax-wpa
+        WPA_AX_SSID = cert-ax-wpa-tel-l3-01
         WPA_AX_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
-        OPEN_AX_SSID = ubuntu-cert-ax-open
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
+        OPEN_AX_SSID = cert-ax-open-tel-l3-01
         TRANSFER_SERVER = cdimage.ubuntu.com
         TEST_TARGET_IPERF = 10.101.48.243
         OBEX_TARGET = 00:02:72:3E:83:D6
diff --git a/jobs/snap-testing/configs/checkbox.conf.newparis b/jobs/snap-testing/configs/checkbox.conf.newparis
index bb4ba70..9c6eb40 100644
--- a/jobs/snap-testing/configs/checkbox.conf.newparis
+++ b/jobs/snap-testing/configs/checkbox.conf.newparis
@@ -2,12 +2,12 @@
         [environment]
         WIFI_INTERFACE=wlan0
         WATCHDOG_KERNEL_MOD=iTCO_wdt
-        OPEN_N_SSID=ubuntu-cert-n-open-tpelab
-        OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
-        OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
-        WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
-        WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
-        WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+        OPEN_N_SSID=cert-n-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_N_PSK=insecure
         WPA_BG_PSK=insecure
         WPA_AC_PSK=insecure
diff --git a/jobs/snap-testing/configs/checkbox.conf.presidio b/jobs/snap-testing/configs/checkbox.conf.presidio
index ea0ea07..8d347c1 100644
--- a/jobs/snap-testing/configs/checkbox.conf.presidio
+++ b/jobs/snap-testing/configs/checkbox.conf.presidio
@@ -1,12 +1,12 @@
 # Please keep the indents below, for yaml formatting/templating
         [environment]
         WIFI_INTERFACE=wlan0
-        OPEN_N_SSID=ubuntu-cert-n-open-tpelab
-        OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
-        OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
-        WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
-        WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
-        WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+        OPEN_N_SSID=cert-n-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_N_PSK=insecure
         WPA_BG_PSK=insecure
         WPA_AC_PSK=insecure
diff --git a/jobs/snap-testing/configs/checkbox.conf.rpi2 b/jobs/snap-testing/configs/checkbox.conf.rpi2
index 07b1969..8c24b84 100644
--- a/jobs/snap-testing/configs/checkbox.conf.rpi2
+++ b/jobs/snap-testing/configs/checkbox.conf.rpi2
@@ -3,15 +3,15 @@
         WIFI_INTERFACE =
         WATCHDOG_KERNEL_MOD =
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         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
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
         TRANSFER_SERVER = cdimage.ubuntu.com
         #TEST_TARGET_IPERF = 10.101.48.219
         TEST_TARGET_IPERF = 10.101.48.243
diff --git a/jobs/snap-testing/configs/checkbox.conf.rpi3 b/jobs/snap-testing/configs/checkbox.conf.rpi3
index 07b1969..8c24b84 100644
--- a/jobs/snap-testing/configs/checkbox.conf.rpi3
+++ b/jobs/snap-testing/configs/checkbox.conf.rpi3
@@ -3,15 +3,15 @@
         WIFI_INTERFACE =
         WATCHDOG_KERNEL_MOD =
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         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
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
         TRANSFER_SERVER = cdimage.ubuntu.com
         #TEST_TARGET_IPERF = 10.101.48.219
         TEST_TARGET_IPERF = 10.101.48.243
diff --git a/jobs/snap-testing/configs/checkbox.conf.staunton b/jobs/snap-testing/configs/checkbox.conf.staunton
index c5793ae..fef74f0 100644
--- a/jobs/snap-testing/configs/checkbox.conf.staunton
+++ b/jobs/snap-testing/configs/checkbox.conf.staunton
@@ -1,12 +1,12 @@
 # Please keep the indents below, for yaml formatting/templating
         [environment]
         WIFI_INTERFACE=wlan0
-        OPEN_N_SSID=ubuntu-cert-n-open-tpelab
-        OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
-        OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
-        WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
-        WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
-        WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+        OPEN_N_SSID=cert-n-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_N_PSK=insecure
         WPA_BG_PSK=insecure
         WPA_AC_PSK=insecure
diff --git a/jobs/snap-testing/configs/checkbox.conf.stlouis b/jobs/snap-testing/configs/checkbox.conf.stlouis
index 57c888f..37d78b5 100644
--- a/jobs/snap-testing/configs/checkbox.conf.stlouis
+++ b/jobs/snap-testing/configs/checkbox.conf.stlouis
@@ -4,15 +4,15 @@
         WIFI_AP_SETUPTIME = 30
         WATCHDOG_KERNEL_MOD = iTCO_wdt
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         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
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
         TRANSFER_SERVER = cdimage.ubuntu.com
         #TEST_TARGET_IPERF = 10.101.48.219
         TEST_TARGET_IPERF = 10.101.48.243
diff --git a/jobs/snap-testing/configs/checkbox.conf.tillamook b/jobs/snap-testing/configs/checkbox.conf.tillamook
index 42f512e..cc43ab5 100644
--- a/jobs/snap-testing/configs/checkbox.conf.tillamook
+++ b/jobs/snap-testing/configs/checkbox.conf.tillamook
@@ -3,9 +3,9 @@
         DISK_READ_PERF=2
         NET_DRIVER_INFO=
         OBEX_TARGET=00:02:72:C5:F9:1F
-        OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
-        OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
-        OPEN_N_SSID=ubuntu-cert-n-open-tpelab
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_N_SSID=cert-n-open-tel-l3-01
         STORE_ID=rigado-store-8b4717
         STRESS_BOOT_ITERATIONS=100
         STRESS_BOOT_WAIT_DELAY=120
@@ -15,11 +15,11 @@
         WIFI_AP_SETUPTIME=60
         WIFI_INTERFACE=wlan0
         WPA_AC_PSK=insecure
-        WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_BG_PSK=insecure
-        WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
         WPA_N_PSK=insecure
-        WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
         WWAN_APN=internet
         WWAN_CONTROL_IF=ttyACM1
         WWAN_NET_IF=ppp0
diff --git a/jobs/snap-testing/configs/checkbox.conf.tillamook-mac b/jobs/snap-testing/configs/checkbox.conf.tillamook-mac
index b222d88..5a5f681 100644
--- a/jobs/snap-testing/configs/checkbox.conf.tillamook-mac
+++ b/jobs/snap-testing/configs/checkbox.conf.tillamook-mac
@@ -3,9 +3,9 @@
         DISK_READ_PERF=2
         NET_DRIVER_INFO=
         OBEX_TARGET=00:02:72:C5:F9:1F
-        OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
-        OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
-        OPEN_N_SSID=ubuntu-cert-n-open-tpelab
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_N_SSID=cert-n-open-tel-l3-01
         STORE_ID=rigado-store-8b4717
         STRESS_BOOT_ITERATIONS=100
         STRESS_BOOT_WAIT_DELAY=120
@@ -15,11 +15,11 @@
         WIFI_AP_SETUPTIME=60
         WIFI_INTERFACE=wlan0
         WPA_AC_PSK=insecure
-        WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_BG_PSK=insecure
-        WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
         WPA_N_PSK=insecure
-        WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
         WWAN_APN=internet
         WWAN_CONTROL_IF=ttyACM1
         WWAN_NET_IF=ppp0
diff --git a/jobs/snap-testing/configs/checkbox.conf.vasteras b/jobs/snap-testing/configs/checkbox.conf.vasteras
index 52511c9..49f4e84 100644
--- a/jobs/snap-testing/configs/checkbox.conf.vasteras
+++ b/jobs/snap-testing/configs/checkbox.conf.vasteras
@@ -1,12 +1,12 @@
 # Please keep the indents below, for yaml formatting/templating
         [environment]
         WIFI_INTERFACE=wlan0
-        OPEN_N_SSID=ubuntu-cert-n-open
-        OPEN_BG_SSID=ubuntu-cert-bg-open
-        OPEN_AC_SSID=ubuntu-cert-ac-open
-        WPA_N_SSID=ubuntu-cert-n-wpa
-        WPA_BG_SSID=ubuntu-cert-bg-wpa
-        WPA_AC_SSID=ubuntu-cert-ac-wpa
+        OPEN_N_SSID=cert-n-open-tel-l3-01
+        OPEN_BG_SSID=cert-bg-open-tel-l3-01
+        OPEN_AC_SSID=cert-ac-open-tel-l3-01
+        WPA_N_SSID=cert-n-wpa-tel-l3-01
+        WPA_BG_SSID=cert-bg-wpa-tel-l3-01
+        WPA_AC_SSID=cert-ac-wpa-tel-l3-01
         WPA_N_PSK=insecure
         WPA_BG_PSK=insecure
         WPA_AC_PSK=insecure
@@ -31,4 +31,4 @@
         STORE_ID=abbha9Ao5Eengooci8tu
         STRESS_NG_DISK_TIME=600
         STRESS_NG_CPU_TIME=600
-        STATIC_IP_ENP1S0=172.16.0.99/24
\ No newline at end of file
+        STATIC_IP_ENP1S0=172.16.0.99/24
diff --git a/jobs/sru/checkbox-raohe.conf b/jobs/sru/checkbox-raohe.conf
deleted file mode 100644
index e582cb0..0000000
--- a/jobs/sru/checkbox-raohe.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Please keep the indents below, for yaml formatting/templating
-        [environment]
-        ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa
-        WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa
-        WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa
-        WPA_AC_PSK = insecure
-        WPA_AX_SSID = ubuntu-cert-ax-wpa
-        WPA_AX_PSK = insecure
-        OPEN_BG_SSID = ubuntu-cert-bg-open
-        OPEN_N_SSID = ubuntu-cert-n-open
-        OPEN_AC_SSID = ubuntu-cert-ac-open
-        OPEN_AX_SSID = ubuntu-cert-ax-open
-        BTDEVADDR = 54:35:30:15:BC:DA
-        TRANSFER_SERVER = cdimage.ubuntu.com
-        DISPLAY= :0
-        SUDO_USER = ubuntu
-        STRESS_NG_DISK_TIME = 15
-        STRESS_NG_CPU_TIME = 60
-        PTS_CACHE_URL = http://10.102.196.9/sru/phoronix_cache/
diff --git a/jobs/sru/checkbox.conf b/jobs/sru/checkbox.conf
index e8c6a4d..2607321 100644
--- a/jobs/sru/checkbox.conf
+++ b/jobs/sru/checkbox.conf
@@ -1,18 +1,18 @@
 # Please keep the indents below, for yaml formatting/templating
         [environment]
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         WPA_AC_PSK = insecure
-        WPA_AX_SSID = ubuntu-cert-ax-wpa
+        WPA_AX_SSID = cert-ax-wpa-tel-l3-01
         WPA_AX_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
-        OPEN_AX_SSID = ubuntu-cert-ax-open
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
+        OPEN_AX_SSID = cert-ax-open-tel-l3-01
         BTDEVADDR = 54:35:30:15:BC:DA
         TRANSFER_SERVER = cdimage.ubuntu.com
         DISPLAY= :0
diff --git a/jobs/upgrade-testing/checkbox.conf b/jobs/upgrade-testing/checkbox.conf
index 33a5f1f..ff99e8f 100644
--- a/jobs/upgrade-testing/checkbox.conf
+++ b/jobs/upgrade-testing/checkbox.conf
@@ -1,18 +1,18 @@
 # Please keep the indents below, for yaml formatting/templating
         [environment]
         ROUTERS = multiple
-        WPA_BG_SSID = ubuntu-cert-bg-wpa-tpelab
+        WPA_BG_SSID = cert-bg-wpa-tel-l3-01
         WPA_BG_PSK = insecure
-        WPA_N_SSID = ubuntu-cert-n-wpa-tpelab
+        WPA_N_SSID = cert-n-wpa-tel-l3-01
         WPA_N_PSK = insecure
-        WPA_AC_SSID = ubuntu-cert-ac-wpa-tpelab
+        WPA_AC_SSID = cert-ac-wpa-tel-l3-01
         WPA_AC_PSK = insecure
-        WPA_AX_SSID = ubuntu-cert-ax-wpa
+        WPA_AX_SSID = cert-ax-wpa-tel-l3-01
         WPA_AX_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
-        OPEN_AX_SSID = ubuntu-cert-ax-open
+        OPEN_BG_SSID = cert-bg-open-tel-l3-01
+        OPEN_N_SSID = cert-n-open-tel-l3-01
+        OPEN_AC_SSID = cert-ac-open-tel-l3-01
+        OPEN_AX_SSID = cert-ax-open-tel-l3-01
         BTDEVADDR = 54:35:30:15:BC:DA
         TRANSFER_SERVER = cdimage.ubuntu.com
         STRESS_NG_DISK_TIME = 15

Follow ups