--- a/common/build.postbuild.xml Wed Dec 09 11:48:17 2009 +0000
+++ b/common/build.postbuild.xml Wed Dec 09 15:55:13 2009 +0000
@@ -689,6 +689,7 @@
<include name="libraries_report.xml"/>
</fileset>
</copy>
+ <mkdir dir="${publish.dir}/ats_reports"/>
</target>
<!-- TODO: Make this work for package builds once we have sysmodel story worked out -->
--- a/common/build.test.xml Wed Dec 09 11:48:17 2009 +0000
+++ b/common/build.test.xml Wed Dec 09 15:55:13 2009 +0000
@@ -168,7 +168,8 @@
<arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/>
<arg value="--src=${sf.spec.test.package.location}\smoketest.zip"/>
<arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>
- <arg value="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>
+ <arg value="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>
+ <arg value="--publish=${publish.dir}\ats_reports"/>
</exec>
<!-- Now ready to send to ATS3 -->
</target>
--- a/common/tools/ats/ats_specialise_test_drop.pl Wed Dec 09 11:48:17 2009 +0000
+++ b/common/tools/ats/ats_specialise_test_drop.pl Wed Dec 09 15:55:13 2009 +0000
@@ -37,6 +37,7 @@
my $unzipper; # Unzip command, depending on whether [unzip or 7z is available.
my $xml_in; # Name of the input xml file. Always 'test.xml' if extracted from zipped test drop.
my $temp_dest_name; # Leafname of temporary output file, if $destfile undefined.
+my $publish; # Publishing folder for ats reports.
sub usage($);
sub help();
@@ -48,7 +49,8 @@
'build-id' => \$build_id,
'src' => \$srcfile,
'dest' => \$destfile,
- 'help' => \$help);
+ 'help' => \$help,
+ 'publish' => \$publish);
GetOptions(\%optmap,
'test-drop-name=s',
@@ -56,7 +58,8 @@
'build-id=s',
'src=s',
'dest=s',
- 'help!')
+ 'help!',
+ 'publish=s')
or usage_error();
if ($help) {
@@ -123,8 +126,8 @@
# Insert the specified build id, if any.
$test_drop->{'test'}->{'buildid'}->[0] = $build_id, if $build_id;
# Insert the FileStoreAction parameter
-my $postaction_params = $test_drop->{'test'}->{'postAction'}->[0]->{'params'}->{'param'};
-$postaction_params->[1] = { 'name' => "to-folder", 'value' => "\\\\localhost\\ats3_testdrop_arrivals\\reports\\" . $test_drop_name };
+my $postaction_params = $test_drop->{'test'}->{'postAction'}->[0]->{'params'}->{'param'}, if $publish;
+$postaction_params->[1] = { 'name' => "to-folder", 'value' => $publish . "\\ats_reports" }, if $publish;
if ($host_name) { # Also insert specified host name
my $devices = $test_drop->{'test'}->{'target'}->[0]->{'device'};