hopfully fixing centos 6 install

the https issue with yum seams to be that the proxy certificate (MITM)
was not taken into account. It should be now.
Also, using baseurl instead of mirrorlist does not work with fedora.
The squid is caching a new url every time, probably because of the use
of https.

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 6a157ac7f54c9aa67d86eb7ed59ed9e113ca5aad..dcb57ce46522a74d9dcd78b5ff891cc8f074d835 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -2882,6 +2882,9 @@ sub target_https_mitm_proxy_setup ($) {
     if (host_is_redhat_derived($ho)) {
         $dest = '/etc/pki/ca-trust/source/anchors';
         $update_ca_cmd = 'update-ca-trust extract';
+        if ($ho->{CentosRelease} == 6) {
+            $update_ca_cmd .= ' && update-ca-trust enable';
+        }
     } else {
         $dest = '/usr/local/share/ca-certificates';
         $update_ca_cmd = 'update-ca-certificates';

diff --git a/ts-xen-install b/ts-xen-install
index 516a7d348c4d21230458bee2bf487ab82aa05cbd..03ff4d0aff731360db447726a723207209b638f9 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -114,19 +114,6 @@ sub packages_redhat () {
     # This packages is necessary, in order to get the right kernel
     # It pull /usr/bin/grub-bootxen.sh (helper to boot Xen by default).
     target_install_packages($ho, qw(centos-release-xen-common));
-    if ($c{HttpProxy}) {
-        # This will always use download.fedoraproject.org, so packages can be
-        # cached by a HTTP proxy. It will also avoid to connect to
-        # mirrors.fedoraproject.org to get a list of mirrors via https which
-        # doesnot work with yum.
-        target_editfile_root($ho, "/etc/yum.repos.d/CentOS-Xen-dependencies.repo", sub {
-            while (<::EI>) {
-                s/^mirrorlist=/#$&/;
-                s/^#(baseurl=)/$1/;
-                print ::EO or die $!;
-            }
-        });
-    }
 
     # Xen
     my @xen_packages = qw(xen);