Bug 493107 - Enhance Y-build to work from master, except for critically different pieces
Summary: Enhance Y-build to work from master, except for critically different pieces
Status: NEW
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Releng (show other bugs)
Version: 4.6   Edit
Hardware: PC Linux
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Platform-Releng-Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-05-05 16:20 EDT by David Williams CLA
Modified: 2016-05-05 16:20 EDT (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description David Williams CLA 2016-05-05 16:20:39 EDT
We have had many "Y-build" failures due to the aggregator script files becoming out of sync with master ... and it is simply a lot to "keep up with" to "manually" merge the BETA_JAVA_46 branch (of aggregator) with master of aggregator. 

As an aside, I probably do not do something quite right with Git, or EGit?, as almost all files show up red, "conflicting", when compared to master, even though identical contents, so hard to see the few places that have changed. I suspect this is -- somehow -- because "Git" thinks they have different parents, even though they should have one in common (with little or no change). 

But, the main point of this bug is that for the BETA_JAVA9 Patch build, we use the master branch of aggregator, with a "PATCH" variable, that controls the few things that are different. The things that are different is about half a dozen files, such as 

A. most important, the streams/repositories.txt file. (The patch build knows to use .../streams/repositoriesjava9patch46.txt instead). Somthing similar could be done for the Y-build. 

B. The patch build uses the latest I-build, via profile, to pick the 4.6-I-build to find "prereqs". -- we would NOT want that for Y-builds. 

C. The patch build uses "computed" file names a few other places, such as "index.template.java9patch46.php" instead of "index.template.php". We could do something similar for Y-builds, probably. 

While I hate to complicate the main line scripts with more and more variables, it seems that might be preferable to constantly having to "keep things in synch", which is highly error prone. Perhaps this would be a good use of Maven's "plugin-properties" to "centralize" the different properties to just a few property files?