[PATCH] osstest: setup git proxy for FreeBSD

[Roger Pau Monne <roger.pau@citrix.com>]

Make the git proxy setup common by moving it into TestSupport and use
it for both Linux and FreeBSD.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm | 20 ++++++++++++++++++++
 ts-build-prep-freebsd  |  1 +
 ts-xen-build-prep      | 19 -------------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index ea546011..f8ef8233 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -138,6 +138,7 @@ BEGIN {
                       host_install_postboot_complete
                       target_core_dump_setup
                       sha256file host_shared_mark_ready
+                      gitcache_setup
                       );
     %EXPORT_TAGS = ( );
 
@@ -2903,4 +2904,23 @@ sub host_shared_mark_ready($$) {
                                               $sharetype);
 }
 
+sub gitcache_setup () {
+    my $proxy = $c{GitCacheProxy};
+    return unless $proxy;
+
+    logm("setting up git cacheing proxy $proxy");
+
+    my $gitcfg = '';
+    foreach my $urlprefix (qw(git:// http:// https://)) {
+        $gitcfg .= <<END
+[url "${proxy}$urlprefix"]
+        insteadOf = $urlprefix
+[url "${proxy}$urlprefix"]
+        insteadOf = ${proxy}$urlprefix
+END
+    }
+    target_putfilecontents_stash($ho,30,$gitcfg,"/home/osstest/.gitconfig",
+                                 'home-osstest-gitconfig');
+}
+
 1;
diff --git a/ts-build-prep-freebsd b/ts-build-prep-freebsd
index e3220fa8..0ed30be4 100755
--- a/ts-build-prep-freebsd
+++ b/ts-build-prep-freebsd
@@ -38,6 +38,7 @@ sub install_deps () {
 }
 
 install_deps();
+gitcache_setup();
 
 our $path_prefix = $r{"freebsd_distpath"} ||
                    get_stashed("path_freebsddist", $r{"freebsdbuildjob"});
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index bff5c927..0ec81000 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -245,25 +245,6 @@ sub ccache_setup () {
     }
 }
 
-sub gitcache_setup () {
-    my $proxy = $c{GitCacheProxy};
-    return unless $proxy;
-
-    logm("setting up git cacheing proxy $proxy");
-
-    my $gitcfg = '';
-    foreach my $urlprefix (qw(git:// http:// https://)) {
-	$gitcfg .= <<END
-[url "${proxy}$urlprefix"]
-        insteadOf = $urlprefix
-[url "${proxy}$urlprefix"]
-        insteadOf = ${proxy}$urlprefix
-END
-    }
-    target_putfilecontents_stash($ho,30,$gitcfg,"/home/osstest/.gitconfig",
-				 'home-osstest-gitconfig');
-}
-
 if (!$ho->{Flags}{'no-reinstall'}) {
     determine_vg_lv();
     lvcreate();
-- 
2.18.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel