commit aec4d2dd81e44d4b65035c4eba604cc128578e80
author David Shrewsbury <shrewsbury.dave@gmail.com> Fri Feb 03 13:47:39 2017 -0500
committer David Shrewsbury <shrewsbury.dave@gmail.com> Fri Feb 03 14:00:58 2017 -0500
tree ce9da1c1c35f9ca538ee6ee164e65ae03fd1362d
parent 21c200e601e17b6684b7afcab3c36eabece21028

Coalesce zuul and nodepool images in integration

Use the same image names in the zuul test that nodepool
actually builds.

Change-Id: I38d6777fdb52f106505ca5f4ca5d37a36309f57e

tests/nodepool/test_nodepool_integration.py

diff --git a/tests/nodepool/test_nodepool_integration.py b/tests/nodepool/test_nodepool_integration.py
index 881aae7..ef459e4 100644
--- a/tests/nodepool/test_nodepool_integration.py
+++ b/tests/nodepool/test_nodepool_integration.py
@@ -53,8 +53,7 @@
         # Test a simple node request
 
         nodeset = model.NodeSet()
-        nodeset.addNode(model.Node('controller', 'fake-label'))
-        nodeset.addNode(model.Node('compute', 'fake-label'))
+        nodeset.addNode(model.Node('controller', 'fake-nodepool'))
         job = model.Job('testjob')
         job.nodeset = nodeset
         request = self.nodepool.requestNodes(None, job)