From ad87d8156524c9c34eafdcbbaaf9d729e12d6374 Mon Sep 17 00:00:00 2001 From: John Dilley Date: Sat, 10 Oct 2015 16:33:58 +0100 Subject: [PATCH] Fix creedence --- exec/testcases/maintenance.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/exec/testcases/maintenance.py b/exec/testcases/maintenance.py index b531fce43..96b6956e6 100755 --- a/exec/testcases/maintenance.py +++ b/exec/testcases/maintenance.py @@ -497,12 +497,17 @@ class BiosSetup(xenrt.TestCase): h.execdom0("apt-get update") else: try: - h.execdom0("wget -q -O - http://linux.dell.com/repo/hardware/Linux_Repository_15.07.00/bootstrap.cgi | bash") - h.execdom0("yum install -y syscfg") + try: + h.execdom0("wget -q -O - http://linux.dell.com/repo/hardware/Linux_Repository_15.07.00/bootstrap.cgi | bash") + h.execdom0("yum install -y syscfg") + except: + h.execdom0("rm -f /etc/yum.repos.d/Citrix.repo") + h.execdom0("rm -f /etc/yum.repos.d/CentOS-Base.repo") + h.execdom0("wget -q -O - http://linux.dell.com/repo/hardware/Linux_Repository_15.07.00/bootstrap.cgi | bash") + h.execdom0("yum install -y syscfg") except: - h.execdom0("rm -f /etc/yum.repos.d/Citrix.repo") - h.execdom0("rm -f /etc/yum.repos.d/CentOS-Base.repo") - h.execdom0("wget -q -O - http://linux.dell.com/repo/hardware/Linux_Repository_15.07.00/bootstrap.cgi | bash") + # Older version for Creedence + h.execdom0("wget -q -O - http://linux.dell.com/repo/hardware/OMSA_7.4.0/bootstrap.cgi | bash") h.execdom0("yum install -y syscfg") h.reboot() syscfg = h.execdom0("/opt/dell/toolkit/bin/syscfg") @@ -569,4 +574,4 @@ class BiosSetup(xenrt.TestCase): except: xenrt.TEC().warning("Failed to disable memtest") except: - xenrt.TEC().warning("Failed to configure Dell extensions") + raise -- 2.39.5