Merge "Rename Node.hold_reason to 'comment'" into feature/zuulv3
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 16d82af..2b1a30f 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -1470,7 +1470,7 @@
'review.example.com/org/project',
'project-test2'])
)
- self.assertEqual(held_node['hold_reason'], "reason text")
+ self.assertEqual(held_node['comment'], "reason text")
# Another failed change should not hold any more nodes
B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
diff --git a/zuul/model.py b/zuul/model.py
index 27ed243..9be8745 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -357,7 +357,7 @@
self.id = None
self.lock = None
self.hold_job = None
- self.hold_reason = None
+ self.comment = None
# Attributes from Nodepool
self._state = 'unknown'
self.state_time = time.time()
@@ -399,7 +399,7 @@
d = {}
d['state'] = self.state
d['hold_job'] = self.hold_job
- d['hold_reason'] = self.hold_reason
+ d['comment'] = self.comment
for k in self._keys:
d[k] = getattr(self, k)
return d
diff --git a/zuul/nodepool.py b/zuul/nodepool.py
index 6b3632b..0696c60 100644
--- a/zuul/nodepool.py
+++ b/zuul/nodepool.py
@@ -61,7 +61,7 @@
for node in nodes:
node.state = model.STATE_HOLD
node.hold_job = " ".join(autohold_key)
- node.hold_reason = reason
+ node.comment = reason
self.sched.zk.storeNode(node)
# We remove the autohold when the number of nodes in hold