simantics/platform and simantics/third-party Git repositories have a branch release/x.y.z[.w] and tag x.y.z[.w].release/x.y.z[.w] and tag called x.y.z[.w].There are both plug-in components and products that are part of the Simantics Release Train that shall be released simultaneously to a major or minor Simantics release.
Plug-in components are installable features that are deployed online as P2 repositories for general availability. Products are deployed as ZIP files and made available online in designated locations on simantics.org.
+Core components of the release train:
+Plug-in components that are part of the release train:
Products that are part of the release train:
When release stabilisation starts, branch simantics/platform and simantics/third-party repositories:
git clone ssh://<user>@www.simantics.org:29418/simantics/platform.git
+When release stabilisation starts, branch all relevant repositories like this:
+git clone ssh://<user>@gerrit.simantics.org:29418/simantics/platform.git
cd platform
git branch release/x.y.z[.w] <commit>
git push origin release/x.y.z[.w]
-
-git clone ssh://<user>@www.simantics.org:29418/simantics/third-party.git
-cd third-party
-git branch release/x.y.z[.w] <commit>
-git push origin release/x.y.z[.w]
When creating major/minor releases <commit> is usually a commit in the master branch.
With service releases, branch from an existing release/* branch instead.
+Instead of doing this clone+branch+push sequence for every SDK repository separately,
+please use the included release-helper.sh shell script to perform this mechanical work. The script supports many useful basic git commands which all perform the requested operation on all the release train repositories. The operations can be seen from the help text printed by the script when given no arguments:
+Usage: release-helper.sh <version> <branch-name> <user-name> clone|branch|checkout|fetch|list-tags|pull|push|push-tags|remove-tag|status|tag
+
+Always begin by cloning all the repositories for working on
+./release-helper.sh x.y.z release/x.y.z your-git-username clone
+
+This will create a directory called x.y.z under the current working directory and clone all the repositories under it. The first <version> argument is only used for the base working directory x.y.z. The second <branch-name> argument tells what branch to specify to the action, i.e. branch, checkout, etc.
+Branching and pushing the branches to remote happens as follows:
+./release-helper.sh x.y.z release/x.y.z your-git-username branch
+./release-helper.sh x.y.z release/x.y.z your-git-username checkout
+./release-helper.sh x.y.z release/x.y.z your-git-username push
+
+If you're creating a service release x.y.w from x.y.z where w > z, do this:
+./release-helper.sh x.y.w release/x.y.z your-git-username clone
+./release-helper.sh x.y.w release/x.y.z your-git-username checkout
+./release-helper.sh x.y.w release/x.y.w your-git-username branch
+./release-helper.sh x.y.w release/x.y.w your-git-username checkout
+# Perhaps make modifications to the branch here and commit to each project separately
+./release-helper.sh x.y.w release/x.y.w your-git-username push
+
Prepare release branch for use
-In release 1.31.0 Simantics started using uses the wonderful tool from Obeo (https://github.com/mbarbero/fr.obeo.releng.targetplatform) to generate .target files from .tpd files which allow much simpler specification of the target contents and also composition of .tpd files via inclusion.
+In release 1.31.0 Simantics started using the wonderful tool from Obeo (https://github.com/mbarbero/fr.obeo.releng.targetplatform) to generate .target files from .tpd files which allow much simpler specification of the target contents and also composition of .tpd files via inclusion.
In the following steps, it is recommended to ensure every .target file is up-to-date by regenerating them from .tpd files. While doing so, take care to use up-to-date online contents to perform the generation.
-Prepare .tpd files
-
+Prepare .tpd files in platform repository
+
-
-
Retrieve release branch of the platform repository
-git clone ssh://<user>@www.simantics.org:29418/simantics/platform.git
-cd platform
-git branch release/x.y.z[.w] remotes/origin/release/x.y.z[.w]
-git checkout release/x.y.z[.w]
+Ensure you've ran
+./release-helper.sh x.y.z release/x.y.z your-git-username checkout
+to make sure you're working on the release branch before doing anything.
+
+-
+
Go into the cloned platform repository at x.y.z/platform
-
Edit all target platform files in releng/org.simantics.sdk.build.targetdefinition/, i.e.
@@ -393,25 +417,37 @@ include "http://www.simantics.org/download/master/org.simantics.sdk.build.t
location "http://www.simantics.org/download/master/sdk" {
with
-location "http://www.simantics.org/download/master/release/x.y.z[.w]/maven" {
-location "http://www.simantics.org/download/master/release/x.y.z[.w]/manual" {
+location "http://www.simantics.org/download/release/x.y.z[.w]/maven" {
+location "http://www.simantics.org/download/release/x.y.z[.w]/manual" {
include "http://www.simantics.org/download/release/x.y.z[.w]/org.simantics.sdk.build.targetdefinition.tpd"
location "http://www.simantics.org/download/release/x.y.z[.w]/sdk" {
-
-
Edit version number of org.simantics.sdk feature in features/org.simantics.sdk.feature/feature.xml to x.y.z[.w].
+Edit version number of org.simantics.sdk feature in features/org.simantics.sdk.feature/feature.xml to x.y.z.
<feature
id="org.simantics.sdk"
label="Simantics SDK"
version="x.y.z"
provider-name="VTT Technical Research Centre of Finland">
-An example of these changes can be seen in gitweb.
+If the release branch you're setting up is a hotfix-release x.y.z.w,
+don't include the .w part in this version.
+An example of these changes can be seen in
+gitweb
+or review 1361.
-
-
Ensure that Redmine has a release engineering issue for the branched release, such as Simantics 1.30.0 release engineering. Make a copy of the previous release issue to create the new one. Include link to original issue while copying.
+Ensure that Gitlab has a release engineering issue for the branched release,
+such as Simantics 1.34.0 release engineering
+
+- Make a new release issue with title
$version release engineering.
+- Add a link to the previous previous release's issue in the new issue description, e.g.
simantics/platform#16.
+- Add labels
releng and $version to the new issue
+
+Commit the changes made
git commit -a
@@ -419,7 +455,7 @@ location "http://www.simantics.org/download/release/x.y.z[.w]/sdk" {
with the commit message
Configured release/x.y.z[.w] branch for SDK builds.
- refs #xxxx
+ gitlab #xxxx
where #xxxx is the number of the x.y.z[.w] release engineering issue and push them to remote
git push origin release/x.y.z[.w]
@@ -427,40 +463,25 @@ location "http://www.simantics.org/download/release/x.y.z[.w]/sdk" {
If you are branching from master, bump the revision of master right now to start the next release cycle in master.
-An example of these changes can be seen in gitweb.
Commit the changes with the following commit message
Bumped master target and org.simantics.sdk feature versions to x.y.z[.w].
-refs #yyyy
+gitlab #yyyy
where #yyyy is the number of the next release's release engineering issue.
release/x.y.z[.w]truerelease/x.y.z[.w]trueDo the same for simupedia target platform files as was done in task 6. +for platform target definitions.
Running these two builds will ensure that both the external components required to build the SDK and the Simantics SDK for the new release branch are published online at http://www.simantics.org/download/release/x.y.z[.w]/.
After this, whenever changes are pushed/merged to release/x.y.z[.w] branch in Gerrit, new SDK/Simantics SDK builds are triggered automatically and they will publish the results at the same location online.
This means that one does not have to do any tricks after this to build and publish the SDK as a P2 repository online. It is an automated process that is performed by the SDK/Simantics SDK Jenkins job.
-.target filesLastly, we want to change the .target files to point to the correct P2 repository locations. This happens by opening the previously edited .tpd files in Obeo's editor and regenerating the .target files by pressing Alt+R.
Push the changed files to remote again with commit message:
-Configured release/x.y.z[.w] branch .target files.
-
-refs #xxxx
-Trigger an execution of the simantics-release-train Jenkins job with parameters
trueto ensure that all components of the release train build fine and to publish first versions of P2 repositories of everything online.
+The release train build is currently never ran automatically.
+However, after following all these steps, whenever changes are pushed/merged to release/x.y.z[.w] branch in Gerrit, new Jenkins builds are triggered automatically and they will publish the results (P2 repositories/products) at their designated locations online.
The release train build does two very important steps as the first things, +i.e. build the external dependency P2 repositories for both the +Platform SDK and Simupedia:
+stage('External Dependencies') {
+ node {
+ build job: 'SDK/Deploy External Components to Web', parameters: params1
+ build job: 'Member Components/Simupedia/fi.semantum.simupedia.build.p2.site', parameters: params1
+ }
+}
+After that it builds the Platform SDK and Simupedia before building anything else:
+stage('SDK') {
+ node {
+ build job: 'SDK/Simantics SDK', parameters: params1
+ // Note that Simantics SDK builds simupedia-git as well
+ }
+}
+Documentation to review:
When the release branches are ready for the release, tag them with the tag vx.y.z[.w]:
git clone ssh://<user>@www.simantics.org:29418/simantics/platform.git
-cd platform
-git checkout release/x.y.z[.w]
-git tag vx.y.z[.w] -m "Simantics x.y.z[.w] simultaneous release"
-git push origin --tags
-
-git clone ssh://<user>@www.simantics.org:29418/simantics/third-party.git
-cd third-party
-git checkout release/x.y.z[.w]
-git tag vx.y.z[.w] -m "Simantics x.y.z[.w] simultaneous release"
-git push origin --tags
+./release-helper.sh x.y.z release/x.y.z your-git-username checkout
+./release-helper.sh x.y.z release/x.y.z your-git-username pull
+./release-helper.sh x.y.z release/x.y.z your-git-username tag
+./release-helper.sh x.y.z release/x.y.z your-git-username push-tags
-Note The -m argument must be supplied to create an annotated tag.
+
Note: release-helper.sh will supply the -m argument to git tag to create an annotated tag.
Only annotated or signed tags can be pushed to Gerrit.
Backup documentation wiki databases
+NOTE: This step is now deprecated since we are in the process of moving all mediawiki-based documentation into the platform git repository.
This step is only necessary for major/minor releases, not for service releases.
The wiki databases to be backed up are: