diff options
| author | Bill Peck <bpeck@redhat.com> | 2014-06-18 14:30:42 -0400 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2014-06-18 14:30:42 -0400 |
| commit | b0ebdea3e19299c763e8bfb20f8e8bd9e86b1265 (patch) | |
| tree | f08624936cf9eca93b63a41d2785d0f74492eed8 | |
| parent | e2071eb38bc86588ce95f314d5d07ea2a90ac69b (diff) | |
| download | tests-b0ebdea3e19299c763e8bfb20f8e8bd9e86b1265.tar.gz tests-b0ebdea3e19299c763e8bfb20f8e8bd9e86b1265.tar.xz tests-b0ebdea3e19299c763e8bfb20f8e8bd9e86b1265.zip | |
Don't bother with reporting the recipe as started
| -rw-r--r-- | distribution/virt/import/Makefile | 1 | ||||
| -rwxr-xr-x | distribution/virt/import/runtest.sh | 3 | ||||
| -rwxr-xr-x | distribution/virt/import/start_recipe.py | 23 |
3 files changed, 0 insertions, 27 deletions
diff --git a/distribution/virt/import/Makefile b/distribution/virt/import/Makefile index 4c718bb..91a7e7f 100644 --- a/distribution/virt/import/Makefile +++ b/distribution/virt/import/Makefile @@ -65,7 +65,6 @@ FILES= $(METADATA) \ Makefile \ get_guest_info.py \ get_guest_fqdn.py \ - start_recipe.py \ logguestconsoles.c \ logguestconsoles.initd \ zrhel5_write_consolelogs.initd \ diff --git a/distribution/virt/import/runtest.sh b/distribution/virt/import/runtest.sh index a84ac20..ba8d8e3 100755 --- a/distribution/virt/import/runtest.sh +++ b/distribution/virt/import/runtest.sh @@ -1029,9 +1029,6 @@ while read -r guest_recipeid guest_name guest_mac guest_args ; do fi fi - # Tell Beaker the guest recipe has started. - ./start_recipe.py $guest_recipeid - DeBug "CMDLINE == $CMDLINE" echo "CMDLINE == $CMDLINE" DeBug "***** Start $virtinst ${CMDLINE} *****" diff --git a/distribution/virt/import/start_recipe.py b/distribution/virt/import/start_recipe.py deleted file mode 100755 index 479e3ed..0000000 --- a/distribution/virt/import/start_recipe.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python - -""" -Marks a guest recipe as started. Pass the recipe ID as the first argument. -""" - -import os -import sys -import xmlrpclib -import xml.dom.minidom - -proxy = xmlrpclib.ServerProxy('http://%s:8000/RPC2' % os.environ['LAB_CONTROLLER']) -recipe_id = int(sys.argv[1]) -recipe_xml = proxy.get_my_recipe(dict(recipe_id=recipe_id)) -doc = xml.dom.minidom.parseString(recipe_xml) - -# This is the same logic as when the 'reboot' command goes through for a real -# system... grab the first task in the recipe and mark it as started. This will -# set the state of the recipe to Running and start the watchdog with some time -# on the clock. The watchdog will be extended again once Anaconda hits -# install_start. -first_task = doc.getElementsByTagName('task')[0] -proxy.task_start(first_task.getAttribute('id')) |