From 9f082ecb39beaa09132a8be611bb640c579d95d0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 17 Feb 2018 18:01:57 +0100 Subject: [MaaS] Override failed testing by default Some nodes fail automatic testing done by MaaS during commissioning, although running the testing suites one more time manually works. For now, just override all 'failed testing' nodes unconditionally. [stable/euphrates cherry-pick additions] Note: Since our salt formulas are pinned to 2017.12 repos, we need to backport one salt-formula-maas patch merged upstream, which adds support for translating status code '22' to 'Failed testing' [1]. JIRA: FUEL-333 [1] https://github.com/salt-formulas/salt-formula-maas/commit/08ffc3ff Change-Id: I13d3ee3d82550524480aa53aa8752ab90aa940cd Signed-off-by: Alexandru Avadanii (cherry picked from commit 81561126307f15d4f65a743ed2431ea8c713a921) --- .../0009-maas.py-Add-missing-status-ids.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 mcp/patches/0009-maas.py-Add-missing-status-ids.patch (limited to 'mcp/patches/0009-maas.py-Add-missing-status-ids.patch') diff --git a/mcp/patches/0009-maas.py-Add-missing-status-ids.patch b/mcp/patches/0009-maas.py-Add-missing-status-ids.patch new file mode 100644 index 000000000..648e62e51 --- /dev/null +++ b/mcp/patches/0009-maas.py-Add-missing-status-ids.patch @@ -0,0 +1,38 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Sun, 17 Dec 2017 06:30:27 +0100 +Subject: [PATCH] maas.py: Add missing status ids + +Status ID list synced from MaaS 2.3 [1]. + +[1] https://github.com/maas/maas/blob/2.3/src/maasserver/\ + migrations/builtin/maasserver/0106_testing_status.py#L25 + +Signed-off-by: Alexandru Avadanii +--- + _modules/maas.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/_modules/maas.py b/_modules/maas.py +index e279b70..1df4698 100644 +--- a/_modules/maas.py ++++ b/_modules/maas.py +@@ -52,7 +52,10 @@ def __virtual__(): + (9, 'Deploying'), (6, 'Deployed'), (7, 'Retired'), (8, 'Broken'), + (11, 'Failed deployment'), (12, 'Releasing'), + (13, 'Releasing failed'), (14, 'Disk erasing'), +- (15, 'Failed disk erasing')]) ++ (15, 'Failed disk erasing'), (16, 'Rescue mode'), ++ (17, 'Entering rescue mode'), (18, 'Failed to enter rescue mode'), ++ (19, 'Exiting rescue mode'), (20, 'Failed to exit rescue mode'), ++ (21, 'Testing'), (22, 'Failed testing')]) + + + def _format_data(data): -- cgit 1.2.3-korg