Bugzilla – Full Text Bug Listing
| Summary: | Incorrect repository names | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | [Eclipse Project] Platform | Reporter: | John Arthorne <john.arthorne> | ||||||||
| Component: | Releng | Assignee: | Platform-Releng-Inbox <platform-releng-inbox> | ||||||||
| Status: | RESOLVED FIXED | QA Contact: | |||||||||
| Severity: | minor | ||||||||||
| Priority: | P3 | CC: | aniefer, dj.houghton, kim.moir, susan | ||||||||
| Version: | 3.4 | Flags: | dj.houghton:
review+
dj.houghton: review+ |
||||||||
| Target Milestone: | 3.4 RC1 | ||||||||||
| Hardware: | PC | ||||||||||
| OS: | Windows XP | ||||||||||
| Whiteboard: | |||||||||||
| Bug Depends on: | 231350 | ||||||||||
| Bug Blocks: | |||||||||||
| Attachments: |
|
||||||||||
|
Description
John Arthorne
Created attachment 99390 [details]
Support setting repository names in generator task
On second thought I guess you are using the generator task, which doesn't seem to support setting the name. This patch adds these options to the generator task.
Patch looks good. +1 The build scripts are setting the repo name to: "Eclipse Project Test Site" which is ok for now but when we run our final builds and then promote them, we don't want the repos to have this name. > The build scripts are setting the repo name to: "Eclipse Project Test Site"
It doesn't look like there is any name on the repositories right now. How are the names being set in the scripts now, since the generator task doesn't seem to support this? I won't commit this change and we can talk tomorrow.
In the build we set
<property name="p2.repo.name" value=""Eclipse Project Test Site"" />
and when we run the generator we pass this argument
<arg line="-metadataRepositoryName ${p2.repo.name}" />
<arg line="-artifactRepositoryName ${p2.repo.name}" />
I entered a separate bug for adding the required support to the generator task: bug 231350. I released the above patch as the fix for that bug. This bug should focus on why our repository names are not showing up in the repositories created by the Eclipse project build scripts. This is a relatively minor issue, as we could manually bash the repository names when we promote the milestone/release repositories. I believe this is a PDE/Build issue. I tracked our p2 build scripts and it looks like we are doing the right thing as Kim suggests in comment #4 but then I remembered that we are now producing p2 metadata as part of the build as well, and this is done before the p2 scripts are being run. So what is happening is the Ant scripts produced by PDE/Build have calls to the generator task and they aren't setting the name, which defaults to the location of the repository. Later on in the p2 scripts we try and set the name but its already been set to the default value so our new name is ignored. Andrew, what are your thoughts on this? I would guess that we would want the repository name to be set in properties file for the packager or wherever the other properties are being set for the calls to the generator? Created attachment 100255 [details]
patch
Attached patch adds properties "p2.metadata.repo.name" and "p2.artifact.repo.name" which are passed by pde.build to the generator. Default value is empty string which results in the previous default name.
EclipseGeneratorApplication is adjust to only use the passed in name if the string is not empty. As well, an unnecessary call to result.setName is removed (name is set by the AbstractRepository constructor.
Kim, once this is in, you should set
p2.metadata.repo.name=${p2.repo.name}
p2.artifact.repo.name=${p2.repo.name}
DJ can you review please.
Patch looks good. +1. Andrew, please confirm with Kim that the properties are set in the right properties file. patch is released, moving bug over to releng for kim Created attachment 100296 [details]
patch for builder to include new properties
+ add new pde.build
*** Bug 224360 has been marked as a duplicate of this bug. *** I ran a test build last night and this fixed the problem. Released for the RC1 rebuild. +1 Kim's patch looked ok to me, I was just waiting to see how a test came out. closing. Is this really fixed? When I add the site http://update.eclipse.org/testUpdates, the name is still showing up as: file:/builds/I200805202000/org.eclipse.releng.eclipsebuilder/../src/repo - metadata Note that the generator will not rename an existing repo. It could be that we are always appending to the testUpdates repo so the original name is still hanging around. |