summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-08-07 09:13:00 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-07 01:42:36 +0200
commitdc9be78b4207e12347f83447c522e66ad806dba6 (patch)
treea798f37ea65082f1184c536ba1e802d7299e9979
parent409e323adfe1ee03d256c07e9f990c022eb587f7 (diff)
qt-jenkins-ci: fixed usage of nonexistent `--log-url' option
This option (to summarize-jenkins-build.pl) was renamed from --log-url to --log-base-url during development, but a few uses of it still had the old name. Change-Id: I29733c32c5cfa9a67bc4b2e94d98b0bd6f54758b Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
-rwxr-xr-xscripts/jenkins/qt-jenkins-ci.pl2
-rw-r--r--scripts/jenkins/t/05-qt-jenkins-ci.t4
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/jenkins/qt-jenkins-ci.pl b/scripts/jenkins/qt-jenkins-ci.pl
index a720986a..edd3a798 100755
--- a/scripts/jenkins/qt-jenkins-ci.pl
+++ b/scripts/jenkins/qt-jenkins-ci.pl
@@ -995,7 +995,7 @@ sub jenkins_build_summary
my @cmd = ($SUMMARIZE_JENKINS_BUILD, '--url', $self->jenkins_build_url( ));
if (my $arg = $self->{ log_download_url }) {
- push @cmd, '--log-url', $arg;
+ push @cmd, '--log-base-url', $arg;
}
if (my $arg = $self->{ force_jenkins_host }) {
push @cmd, '--force-jenkins-host', $arg;
diff --git a/scripts/jenkins/t/05-qt-jenkins-ci.t b/scripts/jenkins/t/05-qt-jenkins-ci.t
index 067dac7a..c65144e3 100644
--- a/scripts/jenkins/t/05-qt-jenkins-ci.t
+++ b/scripts/jenkins/t/05-qt-jenkins-ci.t
@@ -393,7 +393,7 @@ END_JSON
},
cmd => {
- "[$SUMMARIZE_JENKINS_BUILD] [--url] [http://jenkins.example.com/job/Some_Job/5] [--log-url] [http://logs.example.com:8080/ci]"
+ "[$SUMMARIZE_JENKINS_BUILD] [--url] [http://jenkins.example.com/job/Some_Job/5] [--log-base-url] [http://logs.example.com:8080/ci]"
=>
{ exitcode => 0, '>' => '(fake summary)' }
@@ -484,7 +484,7 @@ END_JSON
},
cmd => {
- "[$SUMMARIZE_JENKINS_BUILD] [--url] [http://jenkins.example.com/job/Some_Job/5] [--log-url] [http://logs.example.com:8080/ci]"
+ "[$SUMMARIZE_JENKINS_BUILD] [--url] [http://jenkins.example.com/job/Some_Job/5] [--log-base-url] [http://logs.example.com:8080/ci]"
=>
{ exitcode => 0, '>' => '(fake summary)' }