Skip to main content
Jump to: navigation, search

Difference between revisions of "DTPReleaseContributionInstructions"

m (Preparing DTP Milestone Update Site)
m (Contributing DTP Milestone to Eclipse Simultaneous Release)
Line 62: Line 62:
  
 
2.1. Edit the ''dtp.b3aggrcon'' file.
 
2.1. Edit the ''dtp.b3aggrcon'' file.
:Update the ''versionRange'' attribute value of the 2 feature elements. The  "*.feature.group" suffix in name attribute are used by the simrel build scripts.
+
:* Update the ''versionRange'' attribute value of the 2 feature elements. The  "*.feature.group" suffix in name attribute are used by the simrel build scripts.
:The ''versionRange'' value must match those specified in ''site.xml'' file for the 2 top-level feature jars (listed below), as found in the drops’ features directory:
+
::The ''versionRange'' value must match those specified in ''site.xml'' file for the 2 top-level feature jars (listed below), as found in the drops’ features directory:
:* org.eclipse.datatools.sdk.feature
+
::* org.eclipse.datatools.sdk.feature
:* org.eclipse.datatools.enablement.sdk.feature
+
::* org.eclipse.datatools.enablement.sdk.feature
  
:Save the ''dtp.b3aggrcon'' file.  
+
:* Save the ''dtp.b3aggrcon'' file.  
:Now use the b3 Aggregator Model Editor to open the top level ''simrel.b3aggr'' file. Then run the ''contextMenu->Validate'' command on "Contribution: DataTools", and make sure the validation completes successfully, with no errors flagged with red X's.  
+
:* Now use the b3 Aggregator Model Editor to open the top level ''simrel.b3aggr'' file. Then run the ''contextMenu->Validate'' command on "Contribution: DataTools", and make sure the validation completes successfully, with no errors flagged with red X's.  
:Commit and push the ''dtp.b3aggrcon'' file changes to master branch (for Luna), and/or Kepler_maintenance branch (for Kepler SR2)
+
:* Commit and push the ''dtp.b3aggrcon'' file changes to master branch (for Luna), and/or Kepler_maintenance branch (for Kepler SR2)
  
 
2.2. Add your email as contact, and remove obsolete ones, as appropriate. You will get emails if simrel build failure is caused by DTP contribution.   
 
2.2. Add your email as contact, and remove obsolete ones, as appropriate. You will get emails if simrel build failure is caused by DTP contribution.   
:Use the b3 Aggregator Model Editor to open and edit the top level ''simrel.b3aggr'' file, which will also automatically update the ''dtp.b3aggrcon'' file, as appropriate.
+
:* Use the b3 Aggregator Model Editor to open and edit the top level ''simrel.b3aggr'' file, which will also automatically update the ''dtp.b3aggrcon'' file, as appropriate.
: Add Contacts; show Property View to specify both Email and Name.
+
:* Add Contacts; show Property View to specify both Email and Name.
:Save the ''simrel.b3aggr'' file.  Now run the ''contextMenu->Validate'' command.
+
:* Save the ''simrel.b3aggr'' file.  Now run the ''contextMenu->Validate'' command.
 
::This would make the changes in two places: 1) ''dtp.b3aggrcon'' file, and 2) ''simrel.b3aggr'' file. They contain "model element" that "points both ways". The b3 aggregator would 'validate' that its model is correct.  
 
::This would make the changes in two places: 1) ''dtp.b3aggrcon'' file, and 2) ''simrel.b3aggr'' file. They contain "model element" that "points both ways". The b3 aggregator would 'validate' that its model is correct.  
:Commit and push '''both''' changed files to the simrel Git repo.
+
:* Commit and push '''both''' changed files to the simrel Git repo.
  
 
==Updating the Milestone builds on the DTP Downloads page==
 
==Updating the Milestone builds on the DTP Downloads page==

Revision as of 20:01, 6 March 2014

Preparing DTP Milestone Update Site

The uploading of nightly builds is automatically done by the DTP build scripts, including files upload and downloads page updates. To promote a nightly/integration build as Milestone build, login to “build.eclipse.org” with shell access.
A build administrator user account has a $HOME/downloads link, which should already be setup as a symbolic link to the downloads site.

1. Copy the update site contents from the appropriate Nightly build directory to the Milestone build directory on "build.eclipse.org". For example,

DTP 1.12.0 Milestone update site directory:
~/downloads/datatools/downloads/drops/M_updates_1.12.0
DTP 1.12.0 Nightly update site directory:
~/downloads/datatools/downloads/drops/N_updates_1.12.0/v<buildTimestamp>

1.1 Create a new directory for staging milestone update site. For example,

     cd ~/downloads/datatools/downloads/drops
     mkdir M_updates_1.12.0_staging

1.2 Copy the features and plugins folders from a Nightly build directory to the staging milestone directory. For example,

     cd ~/downloads/datatools/downloads/drops/N_updates_1.12.0/v<buildTimestamp>
     cp -pr features plugins ../../M_updates_1.12.0_staging
     cd ~/downloads/datatools/downloads/drops/M_updates_1.12.0_staging
     chmod g+w features plugins

1.3 Copy the file “site.xml” from the last milestone directory to the staging directory. For example,

     cd ~/downloads/datatools/downloads/drops/M_updates_1.12.0_staging 
     cp ../M_updates_1.12.0/site.xml .

1.4 Edit the site.xml file in the staging milestone directory

Update the value of the feature url and version attributes to the version of the 2 top-level feature jars found in the features directory (that were copied in a previous step). For example,
  <feature url="features/org.eclipse.datatools.sdk.feature_1.12.0.v201402260523-7PB13FEpPZQWdrtqnY7SM0Geyqpc.jar" 
    id="org.eclipse.datatools.sdk.feature" 
    version="1.12.0.v201402260523-7PB13FEpPZQWdrtqnY7SM0Geyqpc">
  <feature url="features/org.eclipse.datatools.enablement.sdk.feature_1.12.0.v201402250837-7IAB-FE9JgeWia2S7rHTvaz0iuBF.jar" 
    id="org.eclipse.datatools.enablement.sdk.feature" 
    version="1.12.0.v201402250837-7IAB-FE9JgeWia2S7rHTvaz0iuBF">

1.5 Generate the P2 metadata files (artifacts.jar and content.jar) in the staging milestone directory

(See the script and related directories packaged in ~/downloads/datatools/tools/dtp-tools.tar.
Extract from dtp-tools.tar to your own account working area, as needed. Then “unzip jdk15.zip” for the JVM to use in below command.)
Run below script command, having substituted the appropriate target update site directory name, e.g. substitute "M_updates_<version>_staging" with “M_updates_1.11.2_staging”.
The generated artifacts.jar and content.jar files will be written to the directory specified by the –targetDir argument.
 ./buildUpdateSiteMetadata.sh -p DTP -basebuilderDir ${HOME}/dtp-tools/org.eclipse.releng.basebuilder 
    -targetDir ${HOME}/downloads/datatools/downloads/drops/M_updates_<version>_staging  
    -vm ${HOME}/dtp-tools/jdk1.5.0_09/bin/java &


When ready to promote the milestone build,

1.6 Rename the last milestone directory for backup. For example,

     mv  M_updates_1.12.0  M_updates_1.12.0_rc1

1.7 Rename the staging milestone directory to the milestone directory, as specified in site.xml. For example,

     mv M_updates_1.12.0_staging M_updates_1.12.0

Contributing DTP Milestone to Eclipse Simultaneous Release

See Contributing_to_Simrel_Aggregation_Build for how to install the “b3 Aggregator Editor”, and how to clone the simrel Git repository.
As of 2/2014, the master branch is for Luna release, and the Kepler_maintenance branch is for the Kepler SR2 release. Pushing the same content in the dtp.b3aggrcon file to both branches would mean promoting the same DTP build to both Luna and Kepler SR2 release.

Git repo URI: ssh://<eclipseid>@git.eclipse.org/gitroot/simrel/org.eclipse.simrel.build.git

2.1. Edit the dtp.b3aggrcon file.

  • Update the versionRange attribute value of the 2 feature elements. The "*.feature.group" suffix in name attribute are used by the simrel build scripts.
The versionRange value must match those specified in site.xml file for the 2 top-level feature jars (listed below), as found in the drops’ features directory:
  • org.eclipse.datatools.sdk.feature
  • org.eclipse.datatools.enablement.sdk.feature
  • Save the dtp.b3aggrcon file.
  • Now use the b3 Aggregator Model Editor to open the top level simrel.b3aggr file. Then run the contextMenu->Validate command on "Contribution: DataTools", and make sure the validation completes successfully, with no errors flagged with red X's.
  • Commit and push the dtp.b3aggrcon file changes to master branch (for Luna), and/or Kepler_maintenance branch (for Kepler SR2)

2.2. Add your email as contact, and remove obsolete ones, as appropriate. You will get emails if simrel build failure is caused by DTP contribution.

  • Use the b3 Aggregator Model Editor to open and edit the top level simrel.b3aggr file, which will also automatically update the dtp.b3aggrcon file, as appropriate.
  • Add Contacts; show Property View to specify both Email and Name.
  • Save the simrel.b3aggr file. Now run the contextMenu->Validate command.
This would make the changes in two places: 1) dtp.b3aggrcon file, and 2) simrel.b3aggr file. They contain "model element" that "points both ways". The b3 aggregator would 'validate' that its model is correct.
  • Commit and push both changed files to the simrel Git repo.

Updating the Milestone builds on the DTP Downloads page

  • Update the DTP downloads page with the downloadable zip files path in the Milestone and/or Integration Builds sections.
The downloads.php file is in the DTP Project Git repository:
     ssh://<user>@git.eclipse.org/gitroot/www.eclipse.org/datatools.git
  • Commit and push the modified downloads.php file to the DTP project Git repository.

Back to the top