From: Dan Lamping <daniel.lamping@citrix.com>
Date: Sun, 22 Nov 2015 12:22:27 +0000 (+0000)
Subject: Added indigo fix for integration suite
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e529f2ca0dd3161cc8f07ffe96334a83527edce0;p=xenrt-citrix%2Fxenrt.git

Added indigo fix for integration suite
---

diff --git a/exec/testcases/xenserver/tc/cimserver.py b/exec/testcases/xenserver/tc/cimserver.py
index ea95947d7..8346bcbfd 100755
--- a/exec/testcases/xenserver/tc/cimserver.py
+++ b/exec/testcases/xenserver/tc/cimserver.py
@@ -53,7 +53,7 @@ class _CIMInterface(object):
             self._startCimLogging()
             return
 
-        suppPack = xenrt.TEC().getFile("xe-phase-2/%s" % self.PACK, self.PACK, "../xe-phase-2/%s" % self.PACK)
+        suppPack = xenrt.TEC().getFile("xe-phase-2/%s" % self.PACK, xenrt.TEC().lookup("INTEGRATION_SUITE"))
         try:
             xenrt.checkFileExists(suppPack)
         except Exception, ex:
@@ -1334,7 +1334,7 @@ class _CimBase(xenrt.TestCase,_CIMInterface):
         if flag == False:
             return
 
-        suppPack = xenrt.TEC().getFile("xe-phase-2/%s" % pack,pack, "../xe-phase-2/%s" % pack)
+        suppPack = xenrt.TEC().getFile("xe-phase-2/%s" % pack,pack, xenrt.TEC().lookup("INTEGRATION_SUITE"))
         try:
             xenrt.checkFileExists(suppPack)
         except Exception, ex:
@@ -3960,7 +3960,7 @@ class _KvpBase(xenrt.TestCase):
         self.wsmanTimings['setup']['threshold'] = 120
 
     def _installSuppPack(self, host):
-        suppPack = xenrt.TEC().getFile("xe-phase-2/%s" % (self.SUPP_PACK_NAME), "../xe-phase-2/%s" % (self.SUPP_PACK_NAME))
+        suppPack = xenrt.TEC().getFile("xe-phase-2/%s" % (self.SUPP_PACK_NAME), xenrt.TEC().lookup("INTEGRATION_SUITE"))
         if not suppPack:
             raise xenrt.XRTError("xenserver-integration-suite iso file not found in xe-phase-2")
 
diff --git a/seqs/creedencelemyseq6.seq b/seqs/creedencelemyseq6.seq
index a3ba3e23b..b53051434 100644
--- a/seqs/creedencelemyseq6.seq
+++ b/seqs/creedencelemyseq6.seq
@@ -2,7 +2,7 @@
   <variables>
     <PRODUCT_VERSION>Creedence</PRODUCT_VERSION>
     <INSTALL_SR_TYPE>lvm</INSTALL_SR_TYPE>
-    <SUPPLEMENTAL_PACK_CDS>xe-phase-2/xenserver-integration-suite.iso</SUPPLEMENTAL_PACK_CDS>
+    <SUPPLEMENTAL_PACK_CDS>%INTEGRATION_SUITE%</SUPPLEMENTAL_PACK_CDS>
   </variables>
 
  <default name="GUESTMEMORY" value="4096"/>