From 916f15af02d68bbab90227cc2d12457061658ed4 Mon Sep 17 00:00:00 2001 From: Toon Caeyers Date: Wed, 28 May 2025 17:24:37 +0200 Subject: [PATCH] Revert "PROVISORY: ci: cdrouter: workaround no-wan-tr069-inform test failures with 480s timeout" This reverts commit 9ad33b2cc03d01201b75c427e0532c6e9420ea4d. Signed-off-by: Toon Caeyers --- .testbed/cdrouter/configurations/generic | 2 +- .testbed/cdrouter/configurations/generic-ipv6 | 2 +- .testbed/cdrouter/configurations/generic-ipv6-dslite | 2 +- .testbed/cdrouter/configurations/generic-ipv6-upnp | 2 +- .testbed/cdrouter/configurations/ppp | 2 +- .testbed/cdrouter/configurations/ppp-ipv6 | 2 +- .testbed/cdrouter/configurations/smoke-test | 2 +- .testbed/cdrouter/configurations/vlan | 2 +- .testbed/cdrouter/configurations/vlan-ipv6 | 2 +- .testbed/cdrouter/configurations/vlan-ppp | 2 +- .testbed/cdrouter/configurations/vlan-ppp-ipv6 | 2 +- .testbed/cdrouter/configurations/wireless | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.testbed/cdrouter/configurations/generic b/.testbed/cdrouter/configurations/generic index 2387b241ee..90bc47b4b2 100644 --- a/.testbed/cdrouter/configurations/generic +++ b/.testbed/cdrouter/configurations/generic @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/generic-ipv6 b/.testbed/cdrouter/configurations/generic-ipv6 index e844871fd6..330ce5bbe9 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6 +++ b/.testbed/cdrouter/configurations/generic-ipv6 @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/generic-ipv6-dslite b/.testbed/cdrouter/configurations/generic-ipv6-dslite index 64b90a2733..912dcfdfd9 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6-dslite +++ b/.testbed/cdrouter/configurations/generic-ipv6-dslite @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/generic-ipv6-upnp b/.testbed/cdrouter/configurations/generic-ipv6-upnp index 4dbdd23467..7ac1a3d96c 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6-upnp +++ b/.testbed/cdrouter/configurations/generic-ipv6-upnp @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/ppp b/.testbed/cdrouter/configurations/ppp index b848a2f9c3..297ff6b0ba 100644 --- a/.testbed/cdrouter/configurations/ppp +++ b/.testbed/cdrouter/configurations/ppp @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/ppp-ipv6 b/.testbed/cdrouter/configurations/ppp-ipv6 index 6f32957c21..72fcc9546b 100644 --- a/.testbed/cdrouter/configurations/ppp-ipv6 +++ b/.testbed/cdrouter/configurations/ppp-ipv6 @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/smoke-test b/.testbed/cdrouter/configurations/smoke-test index 66694f4fe3..2ac5082628 100644 --- a/.testbed/cdrouter/configurations/smoke-test +++ b/.testbed/cdrouter/configurations/smoke-test @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/vlan b/.testbed/cdrouter/configurations/vlan index 17dfa3e072..123967a5ec 100644 --- a/.testbed/cdrouter/configurations/vlan +++ b/.testbed/cdrouter/configurations/vlan @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/vlan-ipv6 b/.testbed/cdrouter/configurations/vlan-ipv6 index c26380f9c0..5c16aab241 100644 --- a/.testbed/cdrouter/configurations/vlan-ipv6 +++ b/.testbed/cdrouter/configurations/vlan-ipv6 @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/vlan-ppp b/.testbed/cdrouter/configurations/vlan-ppp index 13334cdb0b..da18bde8d4 100644 --- a/.testbed/cdrouter/configurations/vlan-ppp +++ b/.testbed/cdrouter/configurations/vlan-ppp @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/vlan-ppp-ipv6 b/.testbed/cdrouter/configurations/vlan-ppp-ipv6 index b3ef49a1b9..808c54c421 100644 --- a/.testbed/cdrouter/configurations/vlan-ppp-ipv6 +++ b/.testbed/cdrouter/configurations/vlan-ppp-ipv6 @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0 diff --git a/.testbed/cdrouter/configurations/wireless b/.testbed/cdrouter/configurations/wireless index 1342ab359a..698aa58a93 100644 --- a/.testbed/cdrouter/configurations/wireless +++ b/.testbed/cdrouter/configurations/wireless @@ -2304,7 +2304,7 @@ SECTION "CDRouter TR-069 Add-On" { # testvar acsDigestQopAuth yes # testvar acsInterface wan testvar acsDiscoveryUrl http://acs-download.qacafe.com:80/ - testvar acsWaitForInform 480 + # testvar acsWaitForInform 120 # testvar acsSkipInitialInform no # testvar acsCpeConnReqURL http://192.168.200.2:80/cwmp # testvar cwmpProtocolVersion 1.0