Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "EclipseSCADA/Release/Perform"
m |
m (→Merge changes from master) |
||
Line 74: | Line 74: | ||
== Merge changes from master == | == Merge changes from master == | ||
+ | |||
+ | Update the qualifier in the "profile". | ||
+ | |||
+ | Create the tag and merge. | ||
git merge -s recursive -Xtheirs origin/master | git merge -s recursive -Xtheirs origin/master |
Revision as of 08:48, 13 December 2013
Contents
Preface
Common stuff
All release builds are performed using the "aggregator-release" project -> https://hudson.eclipse.org/scada/job/aggregator-release/
Related pages:
This document uses "bash" shell commands and assumes your are running a Linux system with the following tools installed:
- Git
- Java 1.7
- Maven
Naming
Release Branch: 0.1.x-release
Tags (Release): R0.1.0
Tags (Milestone): S0.1.0.M1
Process
For each release cycle there will be a new branch: e.g. 0.1.x-release. On this branch we will force the version qualifiers using our own maven plugin. Qualifiers are generated using the tycho jgit buildtimestamp plugin, but using a custom plugin (org.eclipse.scada.releng:build-helper).
The generated qualifiers will be commited, tagged and pushed to the release branch after a local build.
The the Hudson will be used to compile and sign the release branch. It will create a local "staging" directory which will receive the content that will go to download.eclipse.org.
The build is checked and then promoted to the download area.
Check out releng tools
You will need to check out the releng shell scripts:
git clone git://git.eclipse.org/gitroot/eclipsescada/org.eclipse.scada.releng
The shell scripts are under "performRelease". All following commands assume you are in that directory.
You will need to set the environment variable ECLIPSE_COMMITTER to the name of your gerrit account:
export ECLIPSE_COMMITTER=<account>
Change into the project directory:
cd org.eclipse.scada.releng/performRelease/
Prepare new release branch
Create a new branch for each release cycle: e.g. 0.1.x-release
Edit the file "profile" and update the branch name.
Execute:
./createBranch
Check the output in the "workspace" directory.
Push the branch to gerrit:
./pushBranch
Changes on the master must be merged to the release branch during the release cycle. New features that should not be included in the release must go to separate feature branches. After the final release is performed they may be merged on the master.
If it turns out that merging on the release branch is to cumbersome we will make branches for every release tag in order to prevent merge issues.
Merge changes from master
Update the qualifier in the "profile".
Create the tag and merge.
git merge -s recursive -Xtheirs origin/master
Create new release tag
Create a new tag for a new release during the release cyclce.
Edit the file "profile" and update the qualifier name.
Execute:
./createTag
Check the output in the "workspace" directory.
Build locally:
./buildLocally
Wait and check the output in /tmp/my-download-test
If everything looks good push the commit and tag.
Push release commit and tag
Push the forces qualifiers and the tag:
./pushTag
Check https://git.eclipse.org/c if the changes made it to gerrit.
Check the output
The output goes to:
/tmp/my-download-test
Unless you changed the previous command ;-)
Perform build
Perform the build on the Eclipse SCADA Hudson instance
- Job: https://hudson.eclipse.org/scada/job/org.eclipse.scada.releng.superParent/
- Wait for the job to complete!
- Job: https://hudson.eclipse.org/scada/job/aggregator-release/
The result is in the directory "staging" under the workspace of the project "aggregator-release".
Test
The usual…
Promote
To be written…