67 </then> |
67 </then> |
68 </if> |
68 </if> |
69 |
69 |
70 <!-- Zip up all the logs --> |
70 <!-- Zip up all the logs --> |
71 <runtarget target="sf-zip-logs"/> |
71 <runtarget target="sf-zip-logs"/> |
72 <runtarget target="sf-brag-to-diamonds"/> |
72 |
73 |
|
74 <!-- Publish logs/reports --> |
|
75 <if> |
73 <if> |
76 <istrue value="${sf.spec.publish.enable}" /> |
74 <istrue value="${sf.spec.publish.enable}" /> |
77 <then> |
75 <then> |
|
76 <echo message="Send links to Diamonds"/> |
|
77 <runtarget target="sf-links-to-diamonds"/> |
|
78 <echo message="Send BRAG status information to Diamonds"/> |
|
79 <runtarget target="sf-brag-to-diamonds"/> |
|
80 |
78 <echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/> |
81 <echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/> |
79 <runtarget target="sf-publish"/> |
82 <runtarget target="sf-publish"/> |
80 </then> |
83 </then> |
81 </if> |
84 </if> |
82 </target> |
85 </target> |
496 <arg value="${build.log.dir}/analysis/${build.id}_what_results.csv"/> |
499 <arg value="${build.log.dir}/analysis/${build.id}_what_results.csv"/> |
497 </exec> |
500 </exec> |
498 </target> |
501 </target> |
499 |
502 |
500 <target name="sf-run-analysis-diamonds"> |
503 <target name="sf-run-analysis-diamonds"> |
501 <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis.xml"> |
504 <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis-diamonds.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis-diamonds.xml"> |
502 <data expandProperties="yes"> |
505 <data expandProperties="yes"> |
503 ant: antProperties() |
506 ant: antProperties() |
504 raptor_summary: csv(${build.log.dir}/raptorbits/summary.csv,{separator:',',headers:[category,subcategory,severity,config,component,phase,recipe,file,line]}) |
507 raptor_summary: csv(${build.log.dir}/raptorbits/summary.csv,{separator:',',headers:[category,subcategory,severity,config,component,phase,recipe,file,line]}) |
505 files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path,localpath]}) |
508 </data> |
|
509 </fmpp> |
|
510 </target> |
|
511 |
|
512 <target name="sf-links-to-diamonds"> |
|
513 <fmpp sourceFile="${sf.common.config.dir}/diamonds/linksForDiamonds.xml.ftl" outputFile="${build.log.dir}/linksForDiamonds.xml"> |
|
514 <data expandProperties="yes"> |
|
515 ant: antProperties() |
506 </data> |
516 </data> |
507 </fmpp> |
517 </fmpp> |
508 <!-- Send the data to the server --> |
518 <!-- Send the data to the server --> |
509 <exec executable="python"> |
519 <exec executable="python"> |
510 <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/> |
520 <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/> |
511 <arg value="-s"/> |
521 <arg value="-s"/> |
512 <arg value="${diamonds.host}"/> |
522 <arg value="${diamonds.host}"/> |
513 <arg value="-u"/> |
523 <arg value="-u"/> |
514 <arg value="${diamonds.build.id}"/> |
524 <arg value="${diamonds.build.id}"/> |
515 <arg value="-f"/> |
525 <arg value="-f"/> |
516 <arg value="${build.log.dir}/sf-run-analysis.xml"/> |
526 <arg value="${build.log.dir}/linksForDiamonds.xml"/> |
517 </exec> |
527 </exec> |
518 </target> |
528 </target> |
519 |
529 |
520 <target name="sf-brag-to-diamonds"> |
530 <target name="sf-brag-to-diamonds"> |
521 <!-- Merge all our bits of XML together --> |
531 <!-- Merge all our bits of XML together --> |
522 <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml" logError="true"> |
532 <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml" logError="true"> |
523 <arg value="${sf.common.config.dir}/tools/mergeXML.pl"/> |
533 <arg value="${sf.common.config.dir}/tools/mergeXML.pl"/> |
776 <echo message="INFO Validate Zip files"/> |
786 <echo message="INFO Validate Zip files"/> |
777 <runtarget target="sf-package-validate"/> |
787 <runtarget target="sf-package-validate"/> |
778 </then> |
788 </then> |
779 </if> |
789 </if> |
780 <runtarget target="sf-zip-logs"/> |
790 <runtarget target="sf-zip-logs"/> |
781 <runtarget target="sf-brag-to-diamonds"/> |
791 |
782 <if> |
792 <if> |
783 <istrue value="${sf.spec.publish.enable}" /> |
793 <istrue value="${sf.spec.publish.enable}" /> |
784 <then> |
794 <then> |
|
795 <echo message="Send links to Diamonds"/> |
|
796 <runtarget target="sf-links-to-diamonds"/> |
|
797 <echo message="Send BRAG status information to Diamonds"/> |
|
798 <runtarget target="sf-brag-to-diamonds"/> |
|
799 |
785 <echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/> |
800 <echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/> |
786 <runtarget target="sf-publish"/> |
801 <runtarget target="sf-publish"/> |
787 </then> |
802 </then> |
788 </if> |
803 </if> |
789 </target> |
804 </target> |