openstack/devstack-gate
Code Issues Proposed changes

Remove stdout flushes.

Browse Source 
Instead, rely on setting the PYTHONUNBUFFERED env variable
in Jenkins.

Remove "python" from script invocations, rely on #! instead.

Add more output to image update.

Exit gate script after deleting server if there are errors.

Change-Id: I882cfe0fd3be45c041b37947877c24f043ae4a66
This commit is contained in:
James E. Blair
2011-12-24 10:05:32 -08:00
parent 0fdebf32bf
commit b0d8b8be2a
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
slave_scripts/devstack-vm-fetch.py Normal file → Executable file
View File

12
slave_scripts/devstack-vm-gate.sh
View File

@@ -62,29 +62,31 @@ do
cd $WORKSPACE
done
eval `python $CI_SCRIPT_DIR/devstack-vm-fetch.py` || exit $?
eval `$CI_SCRIPT_DIR/devstack-vm-fetch.py` || exit $?
scp -C $CI_SCRIPT_DIR/devstack-vm-gate-host.sh $NODE_IP_ADDR:
RETVAL=$?
if [ $RETVAL != 0 ]; then
echo "Deleting host"
python $CI_SCRIPT_DIR/devstack-vm-delete.py $NODE_UUID
$CI_SCRIPT_DIR/devstack-vm-delete.py $NODE_UUID
exit $RETVAL
fi
scp -C -q -r $WORKSPACE/ $NODE_IP_ADDR:workspace
RETVAL=$?
if [ $RETVAL != 0 ]; then
echo "Deleting host"
python $CI_SCRIPT_DIR/devstack-vm-delete.py $NODE_UUID
$CI_SCRIPT_DIR/devstack-vm-delete.py $NODE_UUID
exit $RETVAL
fi
ssh $NODE_IP_ADDR ./devstack-vm-gate-host.sh
RETVAL=$?
if [ $RETVAL = 0 ] && [ $ALWAYS_KEEP = 0 ]; then
echo "Deleting host"
python $CI_SCRIPT_DIR/devstack-vm-delete.py $NODE_UUID
$CI_SCRIPT_DIR/devstack-vm-delete.py $NODE_UUID
else
#echo "Giving host to developer"
#python $CI_SCRIPT_DIR/devstack-vm-give.py $NODE_UUID
#$CI_SCRIPT_DIR/devstack-vm-give.py $NODE_UUID
exit $RETVAL
fi

7
slave_scripts/devstack-vm-launch.py
View File

@@ -54,7 +54,6 @@ num_to_launch = MIN_READY_MACHINES - (len(ready_machines) +
print "%s ready, %s building, need to launch %s" % (len(ready_machines),
len(building_machines),
num_to_launch)
sys.stdout.flush()
if num_to_launch <= 0 and len(building_machines) == 0:
sys.exit(0)
@@ -91,7 +90,6 @@ if CLOUD_SERVERS_DRIVER == 'rackspace':
print " name: %s [%s]" % (node_name, node.public_ip[0])
print " uuid: %s" % (node.uuid)
print
sys.stdout.flush()
# Wait for nodes
# TODO: The vmdatabase is (probably) ready, but this needs reworking to
@@ -104,23 +102,19 @@ if CLOUD_SERVERS_DRIVER == 'rackspace':
if x['state'] == vmdatabase.BUILDING]
if not building_machines:
print "Finished"
sys.stdout.flush()
break
provider_nodes = conn.list_nodes()
print "Waiting on %s machines" % len(building_machines)
sys.stdout.flush()
for my_node in building_machines:
if my_node['uuid'] in to_ignore: continue
p_nodes = [x for x in provider_nodes if x.uuid == my_node['uuid']]
if len(p_nodes) != 1:
print "Incorrect number of nodes (%s) from provider matching UUID %s" % (len(p_nodes), my_node['uuid'])
sys.stdout.flush()
to_ignore.append(my_node)
else:
p_node = p_nodes[0]
if (p_node.public_ips and p_node.state == NodeState.RUNNING):
print "Node %s is ready" % my_node['id']
sys.stdout.flush()
db.setMachineState(my_node['uuid'], vmdatabase.READY)
if (p_node.public_ips and p_node.state in
[NodeState.UNKNOWN,
@@ -132,7 +126,6 @@ if CLOUD_SERVERS_DRIVER == 'rackspace':
print "Node %s is in error %s (%s/5)" % (my_node['id'],
p_node.state,
count)
sys.stdout.flush()
if count >= 5:
db.setMachineState(my_node['uuid'], vmdatabase.ERROR)
time.sleep(3)

2
slave_scripts/devstack-vm-update-image.py
View File

@@ -131,7 +131,6 @@ def ssh(action, x):
for x in stdout:
output += x
sys.stdout.write(x)
sys.stdout.flush()
ret = stdout.channel.recv_exit_status()
print stderr.read()
if ret:
@@ -185,6 +184,7 @@ for image in images:
IMAGE_NAME = IMAGE_NAME+'-'+str(int(time.time()))
print 'Saving image'
image = conn.ex_save_image(node=node, name=IMAGE_NAME)
last_extra = None