| Summary: | exclude doc bundles from comparator | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | [Eclipse Project] Platform | Reporter: | Kim Moir <kim.moir> | ||||||||||||
| Component: | Releng | Assignee: | Kim Moir <kim.moir> | ||||||||||||
| Status: | RESOLVED FIXED | QA Contact: | |||||||||||||
| Severity: | normal | ||||||||||||||
| Priority: | P3 | CC: | aniefer, dj.houghton, john.arthorne | ||||||||||||
| Version: | 3.6 | Flags: | aniefer:
review+
dj.houghton: review+ john.arthorne: review+ |
||||||||||||
| Target Milestone: | 3.6 RC3 | ||||||||||||||
| Hardware: | PC | ||||||||||||||
| OS: | Windows XP | ||||||||||||||
| Whiteboard: | |||||||||||||||
| Bug Depends on: | 313615 | ||||||||||||||
| Bug Blocks: | |||||||||||||||
| Attachments: |
|
||||||||||||||
|
Description
Kim Moir
Created attachment 168587 [details]
patch
I'll run a test build with this patch and if it works I'll get the approvals. 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.
Andrew, DJ: Please review this patch for inclusion in 3.6RC2. 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. Yes, I'll remove the commented out mirror calls, I just left them there for reference if I had to revert. Thanks DJ and Andrew, this has been released for the next build. 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}" />
Created attachment 169532 [details]
patch
new patch + trying RC1 bundles
If the test build works, I'll ask for approval
Created attachment 169884 [details]
updated patch
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? 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. Created attachment 170079 [details]
updated patch
patch has been verified by a test build
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. Released for 1am build. verified in I20100527-1200 |