Change to offical repository after failing and retry installation on …

…openjdk-7.
fysoft2006 · Mar 6, 2015 · 22214a1 · 22214a1
1 parent 1741bc4
commit 22214a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/perfkitbenchmarker/package_managers.py b/perfkitbenchmarker/package_managers.py
@@ -206,6 +206,7 @@ def InstallPackages(self, packages):
                          '/usr/bin/apt-get -y install %s' % (packages))
       self.RemoteCommand(install_command)
     except errors.VmUtil.SshConnectionError as e:
+      self.RemoteCommand('sudo sed -i "s/azure.//g" /etc/apt/sources.list')
       self.AptUpdate()
       raise e
 

diff --git a/perfkitbenchmarker/packages/openjdk7.py b/perfkitbenchmarker/packages/openjdk7.py
@@ -14,7 +14,7 @@
 
 
 """Module containing OpenJDK7 installation and cleanup functions."""
-
+from perfkitbenchmarker import errors
 
 def YumInstall(vm):
   """Installs the OpenJDK7 package on the VM."""
@@ -23,4 +23,9 @@ def YumInstall(vm):
 
 def AptInstall(vm):
   """Installs the OpenJDK7 package on the VM."""
-  vm.InstallPackages('openjdk-7-jdk')
+  try:
+    vm.InstallPackages('openjdk-7-jdk')
+  except errors.VmUtil.SshConnectionError as e:
+    # Using Ubuntu official repository and retry installation later.
+    vm.RemoteCommand('sudo sed -i "s/azure.//g" /etc/apt/sources.list')
+    raise e