From: Dan Lamping Date: Sun, 22 Nov 2015 08:28:22 +0000 (+0000) Subject: Added indigo fix for upgrade hotfixes X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=69d2b40c81aaf3eca0eb508e430e16988417ec06;p=xenrt-citrix%2Fxenrt.git Added indigo fix for upgrade hotfixes --- diff --git a/exec/testcases/xenserver/tc/upgrade.py b/exec/testcases/xenserver/tc/upgrade.py index d333074a1..1385e1b54 100755 --- a/exec/testcases/xenserver/tc/upgrade.py +++ b/exec/testcases/xenserver/tc/upgrade.py @@ -1150,13 +1150,13 @@ class TCAutoInstaller(xenrt.TestCase): def prepare(self, arglist): self.host = self.getDefaultHost() for f in string.split(xenrt.TEC().lookup(["INSTALLER_PATCH", "INSTALLER"]), ","): - self.host.applyPatch(xenrt.TEC().getFile("xe-phase-1/" + f), returndata=True) + self.host.applyPatch(xenrt.TEC().getFile("xe-phase-1/" + f, "../xe-phase-1/" + f), returndata=True) def run(self, arglist): # Check that the image ISO exists imageName = xenrt.TEC().lookup("CARBON_CD_IMAGE_NAME", 'main.iso') xenrt.TEC().logverbose("Using XS install image name: %s" % (imageName)) - cd = xenrt.TEC().getFile("xe-phase-1/%s" % (imageName), imageName) + cd = xenrt.TEC().getFile("xe-phase-1/%s" % (imageName), "../xe-phase-1/%s" % (imageName), imageName) xenrt.checkFileExists(cd) # Create a temp directory for the image