MAAS CI

Merge ~adam-collard/maas-ci/+git/system-tests:bump-timeouts into ~maas-committers/maas-ci/+git/system-tests:master

  1. Git
  2. lp:~adam-collard/maas-ci/+git/system-tests
  3. bump-timeouts
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 465f35d0e5bc680ee329e228f0dabd037c19e220
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas-ci/+git/system-tests:bump-timeouts
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 52 lines (+5/-5)
2 files modified
systemtests/tests_per_machine/test_machine.py (+4/-4)
systemtests/utils.py (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alberto Donato (community) Approve
Review via email: mp+435834@code.launchpad.net

Commit message

Bump timeouts

Enlistment to 50min from 30min
Other status changes to 40mins from 20mins

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b bump-timeouts lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 465f35d0e5bc680ee329e228f0dabd037c19e220

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemtests/tests_per_machine/test_machine.py b/systemtests/tests_per_machine/test_machine.py
2index f8b42ca..87e8b93 100644
3--- a/systemtests/tests_per_machine/test_machine.py
4+++ b/systemtests/tests_per_machine/test_machine.py
5@@ -95,7 +95,7 @@ def test_full_circle(
6
7 yield
8
9- timeout = 40 * 60 if machine_config.power_type == "lxd" else 20 * 60
10+ TIMEOUT = 40 * 60
11 maas_api_client.commission_machine(machine)
12
13 wait_for_machine(
14@@ -104,7 +104,7 @@ def test_full_circle(
15 status="Ready",
16 abort_status="Failed commissioning",
17 machine_id=machine_config.name,
18- timeout=timeout,
19+ timeout=TIMEOUT,
20 )
21
22 assert machine["ip_addresses"][0] in dynamic_range
23@@ -120,7 +120,7 @@ def test_full_circle(
24 status="Deployed",
25 abort_status="Failed deployment",
26 machine_id=machine_config.name,
27- timeout=timeout,
28+ timeout=TIMEOUT,
29 )
30
31 assert machine["ip_addresses"][0] not in dynamic_range
32@@ -168,6 +168,6 @@ def test_full_circle(
33 status="Ready",
34 abort_status="Releasing failed",
35 machine_id=machine_config.name,
36- timeout=timeout,
37+ timeout=TIMEOUT,
38 )
39 yield
40diff --git a/systemtests/utils.py b/systemtests/utils.py
41index d3858bd..ef4dc37 100644
42--- a/systemtests/utils.py
43+++ b/systemtests/utils.py
44@@ -191,7 +191,7 @@ def wait_for_new_machine(
45 """Blocks execution until a machine with the given mac_address appears as New."""
46 __tracebackhide__ = True
47 quiet_client = api.QuietAuthenticatedAPIClient.from_api_client(api_client)
48- for retry_info in retries(30 * 60, 30):
49+ for retry_info in retries(50 * 60, 30):
50 machines = quiet_client.list_machines(mac_address=mac_address, status="new")
51 if machines:
52 return machines[0]

Subscribers

People subscribed via source and target branches

to all changes: