Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 312962 - exclude doc bundles from comparator
Summary: exclude doc bundles from comparator
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Releng (show other bugs)
Version: 3.6   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 3.6 RC3   Edit
Assignee: Kim Moir CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 313615
Blocks:
  Show dependency tree
 
Reported: 2010-05-14 15:00 EDT by Kim Moir CLA
Modified: 2010-05-27 15:00 EDT (History)
3 users (show)

See Also:
aniefer: review+
dj.houghton: review+
john.arthorne: review+


Attachments
patch (4.43 KB, patch)
2010-05-14 15:01 EDT, Kim Moir CLA
no flags Details | Diff
patch (5.37 KB, patch)
2010-05-17 14:31 EDT, Kim Moir CLA
no flags Details | Diff
patch (4.17 KB, patch)
2010-05-21 14:05 EDT, Kim Moir CLA
no flags Details | Diff
updated patch (4.12 KB, patch)
2010-05-25 15:20 EDT, Kim Moir CLA
no flags Details | Diff
updated patch (4.06 KB, patch)
2010-05-26 15:33 EDT, Kim Moir CLA
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kim Moir CLA 2010-05-14 15:00:47 EDT
I'd like to exclude the doc bundles from the comparator using the functionality that Andrew added to the comparator in bug 302283.  Since the functionality only exists in the p2.mirror task as opposed to older tasks, I've updated our buildAll.xml task to include this as well. Of course, the doc bundles will still be mirrored, but just not compared.
Comment 1 Kim Moir CLA 2010-05-14 15:01:32 EDT
Created attachment 168587 [details]
patch
Comment 2 Kim Moir CLA 2010-05-14 18:17:27 EDT
I'll run a test build with this patch and if it works I'll get the approvals.
Comment 3 Kim Moir CLA 2010-05-17 14:31:21 EDT
Created attachment 168788 [details]
patch

Patch to exclude the doc bundles from being flagged by the comparator. (They change every time because of javadoc generation).  

Because excluding bundles from the comparator is only allowed when running the p2.mirror task, I had to switch from the old p2.mirror.artifacts and p2.mirror.metadata tasks. 

Also, I removed the manual delete of the build time features when extracting the reposource zip.  This caused problems when mirroring because of missing artifacts. Instead I used the remove.iu task.  

I've verified that this works with a test build.
Comment 4 Kim Moir CLA 2010-05-17 14:32:26 EDT
Andrew, DJ: Please review this patch for inclusion in 3.6RC2.
Comment 5 DJ Houghton CLA 2010-05-17 14:51:50 EDT
The call to the mirror task already exists but in comments. Might be worth deleting commented out code to avoid confusion. Or at least put bug number references in comments.
Comment 6 Kim Moir CLA 2010-05-17 17:38:34 EDT
Yes, I'll remove the commented out mirror calls, I just left them there for reference if I had to revert.
Comment 7 Kim Moir CLA 2010-05-18 09:20:23 EDT
Thanks DJ and Andrew, this has been released for the next build.
Comment 8 Kim Moir CLA 2010-05-19 15:52:45 EDT
I have reverted this because it broke the build.  Andrew looked at the code and discovered that if ignoreErrors is enabled in the p2.mirror task, it will mirror the artifacts, but not the metadata and thus the task will exit abnormally.  

Also, he reminded me that I need to add the format of the repository so that the pack.gz files aren't stored in the blobstore

<destination compressed="true" name="${p2.repo.name}" location="file:${buildRepo}" append="true" format="file:${reposource}" />
Comment 9 Kim Moir CLA 2010-05-21 14:05:22 EDT
Created attachment 169532 [details]
patch

new patch + trying RC1 bundles 

If the test build works, I'll ask for approval
Comment 10 Kim Moir CLA 2010-05-25 15:20:47 EDT
Created attachment 169884 [details]
updated patch
Comment 11 Kim Moir CLA 2010-05-25 16:35:32 EDT
Andrew, I ran another test build with the RC2 bundles and this patch applied and the doc bundles are still noted in the comparator log.

http://eclipsebuildserv.ottawa.ibm.com/downloads/bogus/downloads/drops/I20100525-1134/index.php

http://eclipsebuildserv.ottawa.ibm.com/downloads/bogus/downloads/drops/I20100525-1134/buildlogs/comparatorlog.txt

Is this expected? I thought when they were excluded they wouldn't appear in the comparator log?
Comment 12 Andrew Niefer CLA 2010-05-26 11:56:14 EDT
It looks like the version="" attributes are being translated to "[0.0.0,0.0.0]" which doesn't match anything.

You will need to either not specify the version attribute at all, or specify a range:

<exclude>
   <artifact id="org.eclipse.jdt.doc.isv" range="[3.6.0,3.7.0)" />
</exclude>

Sorry I did not catch this when I originally looked at the patch.
Comment 13 Kim Moir CLA 2010-05-26 15:33:06 EDT
Created attachment 170079 [details]
updated patch

patch has been verified by a test build
Comment 14 Kim Moir CLA 2010-05-26 15:35:05 EDT
Adding John for approval for this bug for RC3.  I've verified that it works in multiple test builds.  This will reduce the amount of releng failures that we have due to extraneous comparator warnings.
Comment 15 Kim Moir CLA 2010-05-26 16:38:40 EDT
Released for 1am build.
Comment 16 Kim Moir CLA 2010-05-27 15:00:24 EDT
verified in I20100527-1200