cambridge: Do not try to push harness to XenProject instance output

By arranging for cr-publish-flight-logs to ignore --push-harness if
either of HarnessPublishGitRepoDir or HarnessPublishGitUserHost are
not specified

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2:
 - Avoid logm which isn't available here, wasn't saying much of use
   anyway.
 - Syntax fix (is not a function, so exit not return)

Perhaps we should have our own tree for such things, but for now just
nobble it.

diff --git a/cr-publish-flight-logs b/cr-publish-flight-logs
index 1feb52d621e6a9b246e23004960ccc24514e140f..2e96f601408a332dc543f126af297e4c5dc3f83c 100755 (executable)
--- a/cr-publish-flight-logs
+++ b/cr-publish-flight-logs
@@ -43,6 +43,8 @@ if ($push_harness) {
     my $githost= $c{HarnessPublishGitUserHost};
     my $gitdir= $c{HarnessPublishGitRepoDir};
 
+    exit 0 if (!$githost || !$gitdir);
+
     system_checked("git push $githost:$gitdir HEAD:refs/heads/flight-$flight");
     system_checked("ssh $githost 'cd $gitdir && git update-server-info'");
 }

diff --git a/production-config-cambridge b/production-config-cambridge
index 4c5cd075fd8e17938567df35b7b82d10f8d36d5d..f1da6a6c5e200b9f4e57b93acaec015c3bcf04a6 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -54,9 +54,6 @@ GlobalLockDir /export/home/osstest/testing.git
 LogsPublish= "$c{Publish}/logs"
 ResultsPublish= "$c{Publish}/results"
 
-HarnessPublishGitUserHost xen@xenbits.xensource.com
-HarnessPublishGitRepoDir git/osstest.git
-
 ReportTrailer= <<END
 Logs, config files, etc. are available at
     $c{ReportHtmlPubBaseUrl}