diff --git a/.gitlab/cdrouter/arcadyan-mozart.yml b/.gitlab/cdrouter/arcadyan-mozart.yml index 3053bd607f..71d91b0253 100644 --- a/.gitlab/cdrouter/arcadyan-mozart.yml +++ b/.gitlab/cdrouter/arcadyan-mozart.yml @@ -10,6 +10,7 @@ CDRouter-Top-100+mDNS Mozart initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Mozart VLAN WAN/LAN initramfs: <<: *arcadyan_mozart @@ -19,6 +20,7 @@ CDRouter-Top-100+mDNS Mozart VLAN WAN/LAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Mozart PPPoE WAN initramfs: <<: *arcadyan_mozart @@ -28,6 +30,7 @@ CDRouter-Top-100+mDNS Mozart PPPoE WAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Wireless Mozart initramfs: <<: *arcadyan_mozart @@ -40,6 +43,7 @@ CDRouter-Wireless Mozart initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .arcadyan-mozart-ipv6: &arcadyan_mozart_ipv6 @@ -57,6 +61,7 @@ CDRouter-UPnP-IPv46 Mozart initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-UPnP-IPv46-Failing Mozart initramfs: <<: *arcadyan_mozart_ipv6 @@ -66,6 +71,7 @@ CDRouter-UPnP-IPv46-Failing Mozart initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Mozart initramfs: <<: *arcadyan_mozart_ipv6 @@ -73,6 +79,7 @@ CDRouter-IPv6-Top-100+mDNS Mozart initramfs: CDROUTER_TEST_CONFIG: generic-ipv6 DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prpl-Certification Mozart initramfs: <<: *arcadyan_mozart_ipv6 @@ -87,6 +94,7 @@ prpl-Certification Mozart initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Mozart VLAN WAN/LAN initramfs: <<: *arcadyan_mozart_ipv6 @@ -95,6 +103,7 @@ CDRouter-IPv6-Top-100+mDNS Mozart VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .CDRouter-IPv6-Top-100+mDNS Mozart PPPoE WAN initramfs: <<: *arcadyan_mozart_ipv6 @@ -103,6 +112,7 @@ CDRouter-IPv6-Top-100+mDNS Mozart VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-TR-069 Mozart eMMC: <<: *arcadyan_mozart @@ -113,6 +123,7 @@ CDRouter-TR-069 Mozart eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-USP-prpl Mozart initramfs: <<: *arcadyan_mozart @@ -124,6 +135,7 @@ CDRouter-USP-prpl Mozart initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplWare-Smoke-Test-Suite Mozart initramfs: <<: *arcadyan_mozart_ipv6 @@ -135,6 +147,7 @@ prplWare-Smoke-Test-Suite Mozart initramfs: .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .arcadyan-mozart-certification: &arcadyan_mozart_certification <<: *arcadyan_mozart_ipv6 @@ -150,6 +163,7 @@ prplWare-Smoke-Test-Suite Mozart initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplOS-Network-Test-Plan-Mandatory-v1.2.0 Mozart initramfs: <<: *arcadyan_mozart_certification diff --git a/.gitlab/cdrouter/mxl25641-hdk-6.yml b/.gitlab/cdrouter/mxl25641-hdk-6.yml index 791ceee4f7..2c19ca4a75 100644 --- a/.gitlab/cdrouter/mxl25641-hdk-6.yml +++ b/.gitlab/cdrouter/mxl25641-hdk-6.yml @@ -10,6 +10,7 @@ CDRouter-Top-100+mDNS-OSP MXL25641-HDK-6 eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS-OSP MXL25641-HDK-6 VLAN WAN/LAN eMMC: <<: *mxl25641_cdrouter @@ -19,6 +20,7 @@ CDRouter-Top-100+mDNS-OSP MXL25641-HDK-6 VLAN WAN/LAN eMMC: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS-OSP MXL25641-HDK-6 PPPoE WAN eMMC: <<: *mxl25641_cdrouter @@ -28,6 +30,7 @@ CDRouter-Top-100+mDNS-OSP MXL25641-HDK-6 PPPoE WAN eMMC: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Wireless MXL25641-HDK-6 eMMC: <<: *mxl25641_cdrouter @@ -40,6 +43,7 @@ CDRouter-Wireless MXL25641-HDK-6 eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .mxl25641-cdrouter-ipv6: &mxl25641_cdrouter_ipv6 @@ -66,6 +70,7 @@ CDRouter-UPnP-IPv46-Failing MXL25641-HDK-6 eMMC: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS MXL25641-HDK-6 eMMC: <<: *mxl25641_cdrouter_ipv6 @@ -73,6 +78,7 @@ CDRouter-IPv6-Top-100+mDNS MXL25641-HDK-6 eMMC: CDROUTER_TEST_CONFIG: generic-ipv6 DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prpl-Certification MXL25641-HDK-6 eMMC: <<: *mxl25641_cdrouter_ipv6 @@ -87,6 +93,7 @@ prpl-Certification MXL25641-HDK-6 eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS MXL25641-HDK-6 VLAN WAN/LAN eMMC: <<: *mxl25641_cdrouter_ipv6 @@ -95,6 +102,7 @@ CDRouter-IPv6-Top-100+mDNS MXL25641-HDK-6 VLAN WAN/LAN eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .CDRouter-IPv6-Top-100+mDNS MXL25641-HDK-6 PPPoE WAN eMMC: <<: *mxl25641_cdrouter_ipv6 @@ -103,6 +111,7 @@ CDRouter-IPv6-Top-100+mDNS MXL25641-HDK-6 VLAN WAN/LAN eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-TR-069 MXL25641-HDK-6 eMMC: <<: *mxl25641_cdrouter @@ -110,6 +119,7 @@ CDRouter-TR-069 MXL25641-HDK-6 eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-USP-prpl MXL25641-HDK-6 eMMC: <<: *mxl25641_cdrouter @@ -122,6 +132,7 @@ CDRouter-USP-prpl MXL25641-HDK-6 eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplWare-Smoke-Test-Suite MXL25641-HDK-6 eMMC: <<: *mxl25641_cdrouter_ipv6 @@ -134,6 +145,7 @@ prplWare-Smoke-Test-Suite MXL25641-HDK-6 eMMC: .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .mxl25641-certification: &mxl25641_certification <<: *mxl25641_cdrouter_ipv6 @@ -149,6 +161,7 @@ prplWare-Smoke-Test-Suite MXL25641-HDK-6 eMMC: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplOS-Network-Test-Plan-Mandatory-v1.2.0 MXL25641-HDK-6 eMMC: <<: *mxl25641_certification diff --git a/.gitlab/cdrouter/prpl-haze.yml b/.gitlab/cdrouter/prpl-haze.yml index e718b56c7d..c18a5f516c 100644 --- a/.gitlab/cdrouter/prpl-haze.yml +++ b/.gitlab/cdrouter/prpl-haze.yml @@ -15,6 +15,7 @@ CDRouter-Top-100+mDNS Haze initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Haze VLAN WAN/LAN initramfs: <<: *prpl_haze @@ -24,6 +25,7 @@ CDRouter-Top-100+mDNS Haze VLAN WAN/LAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Haze PPPoE WAN initramfs: <<: *prpl_haze @@ -33,6 +35,7 @@ CDRouter-Top-100+mDNS Haze PPPoE WAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Wireless Haze initramfs: <<: *prpl_haze @@ -43,6 +46,7 @@ CDRouter-Wireless Haze initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .prpl-haze-ipv6: &prpl_haze_ipv6 @@ -59,6 +63,7 @@ CDRouter-UPnP-IPv46 Haze initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-UPnP-IPv46-Failing Haze initramfs: <<: *prpl_haze_ipv6 @@ -68,6 +73,7 @@ CDRouter-UPnP-IPv46-Failing Haze initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Haze initramfs: <<: *prpl_haze_ipv6 @@ -75,6 +81,7 @@ CDRouter-IPv6-Top-100+mDNS Haze initramfs: CDROUTER_TEST_CONFIG: generic-ipv6 DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prpl-Certification Haze initramfs: <<: *prpl_haze_ipv6 @@ -88,6 +95,7 @@ prpl-Certification Haze initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Haze VLAN WAN/LAN initramfs: <<: *prpl_haze_ipv6 @@ -96,6 +104,7 @@ CDRouter-IPv6-Top-100+mDNS Haze VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .CDRouter-IPv6-Top-100+mDNS Haze PPPoE WAN initramfs: <<: *prpl_haze_ipv6 @@ -104,6 +113,7 @@ CDRouter-IPv6-Top-100+mDNS Haze VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-TR-069 Haze eMMC: <<: *prpl_haze @@ -114,6 +124,7 @@ CDRouter-TR-069 Haze eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-USP-prpl Haze initramfs: <<: *prpl_haze @@ -125,6 +136,7 @@ CDRouter-USP-prpl Haze initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplWare-Smoke-Test-Suite Haze initramfs: <<: *prpl_haze_ipv6 @@ -136,6 +148,7 @@ prplWare-Smoke-Test-Suite Haze initramfs: .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .prpl-haze-certification: &prpl_haze_certification <<: *prpl_haze_ipv6 @@ -152,6 +165,7 @@ prplWare-Smoke-Test-Suite Haze initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplOS-Network-Test-Plan-Mandatory-v1.2.0 Haze initramfs: <<: *prpl_haze_certification diff --git a/.gitlab/cdrouter/turris-omnia.yml b/.gitlab/cdrouter/turris-omnia.yml index f52ec5ecf4..58e7763524 100644 --- a/.gitlab/cdrouter/turris-omnia.yml +++ b/.gitlab/cdrouter/turris-omnia.yml @@ -15,6 +15,7 @@ CDRouter-Top-100+mDNS Turris initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Turris VLAN WAN/LAN initramfs: <<: *turris_cdrouter @@ -24,6 +25,7 @@ CDRouter-Top-100+mDNS Turris VLAN WAN/LAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Turris PPPoE WAN initramfs: <<: *turris_cdrouter @@ -33,6 +35,7 @@ CDRouter-Top-100+mDNS Turris PPPoE WAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Wireless Turris initramfs: <<: *turris_cdrouter @@ -43,6 +46,7 @@ CDRouter-Wireless Turris initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .turris-cdrouter-ipv6: &turris_cdrouter_ipv6 @@ -59,6 +63,7 @@ CDRouter-UPnP-IPv46 Turris initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-UPnP-IPv46-Failing Turris initramfs: <<: *turris_cdrouter_ipv6 @@ -68,6 +73,7 @@ CDRouter-UPnP-IPv46-Failing Turris initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Turris initramfs: <<: *turris_cdrouter_ipv6 @@ -75,6 +81,7 @@ CDRouter-IPv6-Top-100+mDNS Turris initramfs: CDROUTER_TEST_CONFIG: generic-ipv6 DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prpl-Certification Turris initramfs: <<: *turris_cdrouter_ipv6 @@ -88,6 +95,7 @@ prpl-Certification Turris initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Turris VLAN WAN/LAN initramfs: <<: *turris_cdrouter_ipv6 @@ -96,6 +104,7 @@ CDRouter-IPv6-Top-100+mDNS Turris VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .CDRouter-IPv6-Top-100+mDNS Turris PPPoE WAN initramfs: <<: *turris_cdrouter_ipv6 @@ -104,6 +113,7 @@ CDRouter-IPv6-Top-100+mDNS Turris VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-TR-069 Turris eMMC: <<: *turris_cdrouter @@ -115,6 +125,7 @@ CDRouter-TR-069 Turris eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-USP-prpl Turris initramfs: <<: *turris_cdrouter @@ -126,6 +137,7 @@ CDRouter-USP-prpl Turris initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplWare-Smoke-Test-Suite Turris initramfs: <<: *turris_cdrouter_ipv6 @@ -137,6 +149,7 @@ prplWare-Smoke-Test-Suite Turris initramfs: .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .turris-certification: &turris_certification <<: *turris_cdrouter_ipv6 @@ -153,6 +166,7 @@ prplWare-Smoke-Test-Suite Turris initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplOS-Network-Test-Plan-Mandatory-v1.2.0 Turris initramfs: <<: *turris_certification diff --git a/.gitlab/cdrouter/wnc-freedom.yml b/.gitlab/cdrouter/wnc-freedom.yml index 65fdbd0824..1ecd0bd1dc 100644 --- a/.gitlab/cdrouter/wnc-freedom.yml +++ b/.gitlab/cdrouter/wnc-freedom.yml @@ -10,6 +10,7 @@ CDRouter-Top-100+mDNS Freedom initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Freedom VLAN WAN/LAN initramfs: <<: *wnc_freedom @@ -19,6 +20,7 @@ CDRouter-Top-100+mDNS Freedom VLAN WAN/LAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Top-100+mDNS Freedom PPPoE WAN initramfs: <<: *wnc_freedom @@ -28,6 +30,7 @@ CDRouter-Top-100+mDNS Freedom PPPoE WAN initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-Wireless Freedom initramfs: <<: *wnc_freedom @@ -40,6 +43,7 @@ CDRouter-Wireless Freedom initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .wnc-freedom-ipv6: &wnc_freedom_ipv6 @@ -57,6 +61,7 @@ CDRouter-UPnP-IPv46 Freedom initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-UPnP-IPv46-Failing Freedom initramfs: <<: *wnc_freedom_ipv6 @@ -66,6 +71,7 @@ CDRouter-UPnP-IPv46-Failing Freedom initramfs: CDROUTER_TEST_CONFIG: generic-ipv6-upnp DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Freedom initramfs: <<: *wnc_freedom_ipv6 @@ -73,6 +79,7 @@ CDRouter-IPv6-Top-100+mDNS Freedom initramfs: CDROUTER_TEST_CONFIG: generic-ipv6 DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prpl-Certification Freedom initramfs: <<: *wnc_freedom_ipv6 @@ -87,6 +94,7 @@ prpl-Certification Freedom initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-IPv6-Top-100+mDNS Freedom VLAN WAN/LAN initramfs: <<: *wnc_freedom_ipv6 @@ -95,6 +103,7 @@ CDRouter-IPv6-Top-100+mDNS Freedom VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-vlans.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .CDRouter-IPv6-Top-100+mDNS Freedom PPPoE WAN initramfs: <<: *wnc_freedom_ipv6 @@ -103,6 +112,7 @@ CDRouter-IPv6-Top-100+mDNS Freedom VLAN WAN/LAN initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-enable-pppoe.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-TR-069 Freedom eMMC: <<: *wnc_freedom @@ -113,6 +123,7 @@ CDRouter-TR-069 Freedom eMMC: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh CDRouter-USP-prpl Freedom initramfs: <<: *wnc_freedom @@ -125,6 +136,7 @@ CDRouter-USP-prpl Freedom initramfs: DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplWare-Smoke-Test-Suite Freedom initramfs: <<: *wnc_freedom_ipv6 @@ -136,6 +148,7 @@ prplWare-Smoke-Test-Suite Freedom initramfs: .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh .wnc-freedom-certification: &wnc_freedom_certification <<: *wnc_freedom_ipv6 @@ -151,6 +164,7 @@ prplWare-Smoke-Test-Suite Freedom initramfs: .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh prplOS-Network-Test-Plan-Mandatory-v1.2.0 Freedom initramfs: <<: *wnc_freedom_certification diff --git a/.gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh b/.gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh new file mode 100755 index 0000000000..001c4518d5 --- /dev/null +++ b/.gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh @@ -0,0 +1,75 @@ +#!/bin/bash + +source ${CI_PROJECT_DIR}/.gitlab/scripts/helpers.sh + +set -eu # exit on error and undefined variables +set -o pipefail # catch errors in pipes + +# Execute provided command using ba-cli --less --json +ba_cli_json() { + # shellcheck disable=SC2029 + ssh "root@$TARGET_LAN_IP" "ba-cli --less --json '$1'" +} + +# Execute provided command using ba-cli --less +ba_cli() { + # shellcheck disable=SC2029 + ssh "root@$TARGET_LAN_IP" "ba-cli '$1'" +} + +# Waits for ProcessMonitor.Test.i to become available after booting of CPE +wait_till_dm_ready() { + local diff=0 + local start_time + local current_time + local timeout=180 + local process_monitor_path="" + + start_time=$(cut -d. -f1 /proc/uptime) + + log_info "Checking if ProcessMonitor.Test.i datamodel is available..." + + while [ -z "$process_monitor_path" ]; do + process_monitor_path=$(ba_cli_json "ProcessMonitor.Test.?" \ + | jq -r '.[0] | keys[]' 2>/dev/null | sed 's/\.$//') \ + || true + current_time=$(cut -d. -f1 /proc/uptime) + diff=$((current_time - start_time)) + + if [ $diff -ge $timeout ]; then + log_error "Timeout waiting for ProcessMonitor.Test.i \ + to be available!" + exit 1 + fi + + if [ -z "$process_monitor_path" ]; then + log_info "Waiting for ProcesMonitor.Test.i datamodel \ + to be available ($diff s)" + sleep 5 + fi + done + + log_success "ProcessMonitor.Test.i datamodel is available" +} + +# Check ProcessMonitor.Test.i.FailAction for all process and if set as REBOOT +# change it to RESTART CI cram and CDRouter tests +change_fail_action_to_restart() { + for id in $(ba_cli 'ProcessMonitor.Test.[FailAction == "REBOOT"].?' | \ + grep Name | \ + sed -n 's/.*Test\.\([0-9]\+\).*/\1/p'); do + ba_cli \ + "ProcessMonitor.Test.$id.FailAction=\"RESTART\"" \ + > /dev/null + log_info "Modified ProcessMonitor.Test.$id" \ + "FailAction from REBOOT to RESTART" + done + log_info "Completed with ProcessMonitor FailAction update" +} + +main() { + wait_till_dm_ready + change_fail_action_to_restart +} + +main diff --git a/.gitlab/testbed.yml b/.gitlab/testbed.yml index 59de132a33..4cb86fbf51 100644 --- a/.gitlab/testbed.yml +++ b/.gitlab/testbed.yml @@ -32,6 +32,8 @@ .gitlab/tests/cram/$DUT_BOARD CRAM_TEST_SUITE_POST: | .gitlab/tests/cram/post/generic + DUT_INIT_SCRIPTS: | + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh before_script: - source .gitlab/scripts/helpers.sh @@ -100,6 +102,11 @@ - ssh root@$TARGET_LAN_IP "cat /var/log/messages" > syslog-$LABGRID_TARGET.txt 2> /dev/null || true - ssh root@$TARGET_LAN_IP "ubus call system board" | tee system-$LABGRID_TARGET.json + - > + for dut_init_script in $DUT_INIT_SCRIPTS; + do echo "Running $dut_init_script"; "${CI_PROJECT_DIR}/$dut_init_script"; + done + - section_end "dut-system-info" script: diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/004-amx-pre-test-verify-fail-action.t b/.gitlab/tests/cram/generic/acceleration-plan-components/004-amx-pre-test-verify-fail-action.t new file mode 100644 index 0000000000..7ce4b74d86 --- /dev/null +++ b/.gitlab/tests/cram/generic/acceleration-plan-components/004-amx-pre-test-verify-fail-action.t @@ -0,0 +1,18 @@ +Create R alias: + + $ alias R="${CRAM_REMOTE_COMMAND:-}" + + $ R logger -t cram "Starting with amx-processmonitoring pre-checks" + +Ensure ProcessMonitor.Test.i.FailAction does not have REBOOT action: + + $ R "ba-cli -l ProcessMonitor.Test.*.FailAction\? | "\ + > "grep -vE '(RESTART|NONE)' | sed '/^$/d'" + +Verify any process monitoring failures observed before starting with tests: + + $ R "grep \"amx-processmonitor: process - \[!\]Test.*failed too often,"\ + > " executing action\" /var/log/messages* /var/log/messagess.? 2>/dev/null" \ + > "|| true" + + $ R logger -t cram "Pre-checks for amx-processmonitoring tests completed" diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/006-amx-monitoring-change-subject.t b/.gitlab/tests/cram/generic/acceleration-plan-components/006-amx-monitoring-change-subject.t index 0a446257da..e73d1d3cb5 100644 --- a/.gitlab/tests/cram/generic/acceleration-plan-components/006-amx-monitoring-change-subject.t +++ b/.gitlab/tests/cram/generic/acceleration-plan-components/006-amx-monitoring-change-subject.t @@ -13,7 +13,8 @@ Set script parameters and copy the script to device: $ R logger -t cram "Starting with amx-processmonitoring change subject reset cram test" -Pre-test actions, Restart the process service to clear the respawns and other failures before starting with tests: +Pre-test actions, Restart the process service to clear the respawns and other +failures before starting with tests: $ R "service tr181-mcastd restart > /dev/null 2>&1" $ R "service tr181-pcp restart > /dev/null 2>&1" @@ -221,4 +222,4 @@ Restart the process service to clear the respawns from above tests: $ R "service tr181-qos restart > /dev/null 2>&1" $ R "service dhcpv4-manager restart > /dev/null 2>&1" - $ R logger -t cram "Amx-processmonitoring change subject reset cram test finished" + $ R logger -t cram "Amx-processmonitoring reset cram test finished" diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/008-verify-amx-monitoring-enabled.t b/.gitlab/tests/cram/generic/acceleration-plan-components/008-verify-amx-monitoring-enabled.t index 41474ae3b2..8943c5f7e6 100644 --- a/.gitlab/tests/cram/generic/acceleration-plan-components/008-verify-amx-monitoring-enabled.t +++ b/.gitlab/tests/cram/generic/acceleration-plan-components/008-verify-amx-monitoring-enabled.t @@ -2,7 +2,7 @@ Create R alias: $ alias R="${CRAM_REMOTE_COMMAND:-}" - $ R logger -t "Starting with amx-processmonitoring enable test" + $ R logger -t cram "Starting with amx-processmonitoring enable test" This Helper method finds the Instance Id and return the ProcessMonitoringEnabled parameter, #Param1 - name of the process: @@ -42,4 +42,6 @@ Verify all expected processes are enabled for monitoring by amx-processmonitor, $ if echo "$CI_JOB_NAME" | grep -q -E "(Mozart|Turris|Haze|HDK-3)"; then exit 80; fi $ get_amx_process_monitoring cellular-manager - cellular-manager=1 \ No newline at end of file + cellular-manager=1 + + $ R logger -t cram "Amx-processmonitoring Process Enable tests finished" diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/009-amx-process-fail.t b/.gitlab/tests/cram/generic/acceleration-plan-components/009-amx-process-fail.t index 4ac967475d..067bc95bb3 100644 --- a/.gitlab/tests/cram/generic/acceleration-plan-components/009-amx-process-fail.t +++ b/.gitlab/tests/cram/generic/acceleration-plan-components/009-amx-process-fail.t @@ -188,4 +188,11 @@ Restart process service to clear the respawns from above tests: $ R "service tr181-qos restart > /dev/null 2>&1" $ R "service dhcpv4-manager restart > /dev/null 2>&1" +Verify for any amx-processmonitoring failure action during tests, Any pre-test\ +failures seen by 004-amx-pre-test-verify-fail-action.t will be seen again: + + $ R "grep \"amx-processmonitor: process - \[!\]Test.*failed too often,"\ + > " executing action\" /var/log/messages* /var/log/messagess.? 2>/dev/null" \ + > "|| true" + $ R logger -t cram "Amx-processmonitoring process fail test finished"