osstest: introduce host_shared_mark_ready

That allows marking a host as ready to be shared. Replace the current
callers that open-code it.

This commit also fixes a bug where Ident was used instead of 'host' as
resource.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Changes since v4:
 - New in this version.

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 8799712e8cda00ef5821b0aa1828177d40a1c724..69aed2ff3270fece87e3aceeeabc2eadd261507a 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -136,7 +136,7 @@ BEGIN {
                       guest_editconfig_nocd
                       host_install_postboot_complete
                       target_core_dump_setup
-                      sha256file
+                      sha256file host_shared_mark_ready
                       );
     %EXPORT_TAGS = ( );
 
@@ -2844,4 +2844,11 @@ sub sha256file ($;$) {
     return $truncate ? substr($digest, 0, $truncate) : $digest;
 }
 
+sub host_shared_mark_ready($$) {
+    my ($ho,$sharetype) = @_;
+
+    $mjobdb->jobdb_resource_shared_mark_ready('host', $ho->{Name},
+                                              $sharetype);
+}
+
 1;

diff --git a/ts-freebsd-host-install b/ts-freebsd-host-install
index 984bdf0a5a41c0e447282a61d83ef832f4b67039..357c0b72095c5813b9c04d18b3666f7430781e15 100755 (executable)
--- a/ts-freebsd-host-install
+++ b/ts-freebsd-host-install
@@ -279,5 +279,5 @@ setup_netboot_local($ho);
 # Proceed with the install
 install();
 
-resource_shared_mark_ready($ho, "build-freebsd-".
-                                sha256file("$path_prefix/install.img", 16));
+host_shared_mark_ready($ho, "build-freebsd-".
+                            sha256file("$path_prefix/install.img", 16));

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 3309216680a8f3581d848c9e1798febe36c3745b..bff5c927a6b0aa17d5a66fed1d62f8c517641787 100755 (executable)
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -274,5 +274,5 @@ if (!$ho->{Flags}{'no-reinstall'}) {
     ccache_setup();
     gitcache_setup();
 }
-$mjobdb->jobdb_resource_shared_mark_ready
-   ($ho->{Ident}, $ho->{Name}, "build-".$ho->{Suite}."-".$r{arch});
+
+host_shared_mark_ready($ho, "build-".$ho->{Suite}."-".$r{arch});