From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 2/8] Publish: Default LogsPublish and ResultsPublish from Publish
Date: Wed, 11 Jul 2018 15:14:14 +0100 [thread overview]
Message-ID: <1531318460-4509-3-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1531318460-4509-1-git-send-email-ian.jackson@eu.citrix.com>
And delete the explicit settings from production-config.
No functional change.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
Osstest.pm | 4 ++--
production-config | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Osstest.pm b/Osstest.pm
index 3377ea3..738ed4f 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -255,8 +255,8 @@ END
my $pubbaseprefix = $c{PubBaseDir} ? "$c{PubBaseDir}/" : "";
foreach my $l (qw(logs results)) {
my $u = ucfirst $l;
- next if defined $c{$u};
- $c{"${u}"} = "$pubbaseprefix$l";
+ $c{"${u}"} //= "$pubbaseprefix$l";
+ $c{"${u}Publish"} //= "$c{Publish}/$l" if defined $c{Publish};
}
$c{Stash} //= $c{Logs};
diff --git a/production-config b/production-config
index 48b1e8e..df02cd3 100644
--- a/production-config
+++ b/production-config
@@ -59,9 +59,6 @@ ReportHtmlUnpubBaseUrl="http://osstest/~osstest/pub/logs/"
Publish osstest@www:/var/www/osstest
GlobalLockDir /home/osstest/testing.git
-LogsPublish= "$c{Publish}/logs"
-ResultsPublish= "$c{Publish}/results"
-
HarnessPublishGitUserHost osstest@xenbits.xen.org
HarnessPublishGitRepoDir ext/osstest-massachusetts.git
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-07-11 14:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 14:14 [OSSTEST PATCH 0/8] Log publication from Citrix Cambridge Ian Jackson
2018-07-11 14:14 ` [OSSTEST PATCH 1/8] cr-ensure-disk-space: With -D, print check_space command Ian Jackson
2018-07-11 14:14 ` Ian Jackson [this message]
2018-07-11 14:14 ` [OSSTEST PATCH 3/8] cr-publish-flight-logs: Refactor copydir args Ian Jackson
2018-07-11 14:14 ` [OSSTEST PATCH 4/8] cr-publish-flight-logs: Refactor rsync -e option construction Ian Jackson
2018-07-11 14:14 ` [OSSTEST PATCH 5/8] Publish: Introduce publish_ssh_opts Ian Jackson
2018-07-11 14:14 ` [OSSTEST PATCH 6/8] Publish: Introduce {Logs, Results}PublishSshOpts Ian Jackson
2018-07-11 14:14 ` [OSSTEST PATCH 7/8] Publish: Cambridge: Publish to new public host Ian Jackson
2018-07-11 14:14 ` [OSSTEST PATCH 8/8] Publish: Cambridge: Get the public URL right Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1531318460-4509-3-git-send-email-ian.jackson@eu.citrix.com \
--to=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).