From 0a4b815c9051a20c705d2b77619b41dfb9a3034f Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Mon, 8 Jan 2018 15:57:25 +0200 Subject: [PATCH] Updated release engineering instructions refs #7712 Change-Id: I511149845a69a686832665bcc95ac854ee00bbe4 --- releng/doc/release.html | 41 +++++++++++++++++++++++++++----------- releng/doc/release.md | 44 ++++++++++++++++++++++++++++++----------- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/releng/doc/release.html b/releng/doc/release.html index cd2aea0df..487f47696 100644 --- a/releng/doc/release.html +++ b/releng/doc/release.html @@ -293,7 +293,7 @@ img {

Definition of Done for Simantics Platform Releases

The simantics/platform and simantics/third-party Git repositories have a branch release/x.y.z[.w] and tag x.y.z[.w].
All Git repositories that are part of the Simantics release train have a branch called release/x.y.z[.w] and tag called x.y.z[.w].
A change log entry is compiled from the issues in this release and made available to the general public separately for the platform and for the open products included in the release train.
Roadmap is up-to-date.
Tutorials are up-to-date and coherent with the platform.

Released Plug-in Components and Products

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:

External third party library dependencies required by the platform - simantics/third-party.git
The Simantics Platform - simantics/platform.git

Plug-in components that are part of the release train:

Simupedia - members/simupedia.git

Simantics Platform Release - Step by Step

Create release branch from selected commit

When release stabilisation starts, branch simantics/platform and simantics/third-party repositories:

When release stabilisation starts, branch all relevant repositories like this:

git clone ssh://<user>@www.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.

Use of the included release-helper.sh shell script is highly encouraged 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
+

First, begin by cloning all the repositories:

./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.

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 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 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.

An example of these changes can be seen in gitweb.

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.
@@ -427,7 +438,13 @@ 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.

+An example of these changes can be seen in gitweb or in review 1362. The changes include:

Simantics Desktop splash screen update (version number)
Simantics target platform name to state correct development version
org.simantics.sdk feature version bump
org.simantics.sdk.repository project version bump

Commit the changes with the following commit message

Bumped master target and org.simantics.sdk feature versions to x.y.z[.w].
 
@@ -454,13 +471,14 @@ refs #yyyy
 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.
-Update .target files
-Lastly, 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.
+Update release-branch .target files
+Next, we want to change the .tpd and .target files to point to the correct P2 repository locations in the release-branch. 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
 
+See review 1361 for an example.
 Test Release Train build
 Trigger an execution of the simantics-release-train Jenkins job with parameters
 
@@ -513,6 +531,7 @@ git push origin --tags
 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:
 
diff --git a/releng/doc/release.md b/releng/doc/release.md
index 93796ce14..36f86cd0c 100644
--- a/releng/doc/release.md
+++ b/releng/doc/release.md
@@ -1,6 +1,6 @@
 # Definition of Done for Simantics Platform Releases
 
-1. The `simantics/platform` and `simantics/third-party` Git repositories have a branch `release/x.y.z[.w]` and tag `x.y.z[.w]`.
+1. All Git repositories that are part of the Simantics release train have a branch called `release/x.y.z[.w]` and tag called `x.y.z[.w]`.
 2. [A change log entry](https://www.simantics.org/redmine/projects/simantics-platform/wiki/ChangeLog) is compiled from the issues in this release and made available to the general public separately for the platform and for the open products included in the release train.
 3. [Roadmap](http://dev.simantics.org/index.php/Roadmap) is up-to-date.
 4. [Tutorials](http://dev.simantics.org/index.php/Tutorials) are up-to-date and coherent with the platform.
@@ -28,6 +28,10 @@ There are both plug-in components and products that are part of the _Simantics R
 
 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:
+* External third party library dependencies required by the platform - [simantics/third-party.git](https://www.simantics.org:8088/r/gitweb?p=simantics/third-party.git;a=summary)
+* The Simantics Platform - [simantics/platform.git](https://www.simantics.org:8088/r/gitweb?p=simantics/platform.git;a=summary)
+
 Plug-in components that are part of the release train:
 * Simupedia - [members/simupedia.git](https://www.simantics.org:8088/r/gitweb?p=members/simupedia.git;a=summary)
 * FMIL - [simantics/fmil.git](https://www.simantics.org:8088/r/gitweb?p=simantics/fmil.git;a=summary)
@@ -60,21 +64,31 @@ For simplicity, each of these components are versioned accoring to platform vers
 
 ## Create release branch from selected commit
 
-When release stabilisation starts, branch `simantics/platform` and `simantics/third-party` repositories:
+When release stabilisation starts, branch all relevant repositories like this:
 
     git clone ssh://@www.simantics.org:29418/simantics/platform.git
     cd platform
     git branch release/x.y.z[.w] 
     git push origin release/x.y.z[.w]
 
-    git clone ssh://@www.simantics.org:29418/simantics/third-party.git
-    cd third-party
-    git branch release/x.y.z[.w] 
-    git push origin release/x.y.z[.w]
-
 When creating major/minor releases `` is usually a commit in the `master` branch.
 With service releases, branch from an existing `release/*` branch instead.
 
+Use of the included `release-helper.sh` shell script is highly encouraged 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    clone|branch|checkout|fetch|list-tags|pull|push|push-tags|remove-tag|status|tag
+
+First, begin by cloning all the repositories:
+
+    ./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.
+
+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 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](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.
@@ -121,7 +135,7 @@ In the following steps, it is recommended to ensure every `.target` file is up-t
          provider-name="VTT Technical Research Centre of Finland">
    ~~~
 
-   An example of these changes can be seen in [gitweb](https://www.simantics.org:8088/r/gitweb?p=simantics/platform.git;a=commit;h=bab5c9bd68277c76dc5c20bc7a60a9896cbd1540).
+   An example of these changes can be seen in [gitweb](https://www.simantics.org:8088/r/gitweb?p=simantics%2Fplatform.git;a=commit;h=5271b0faa98303225d00e6cd838d3fc52488545c) or [review 1361](https://www.simantics.org:8088/r/#/c/1361/).
 
 4. Ensure that Redmine has a release engineering issue for the branched release, such as [Simantics 1.30.0 release engineering](https://www.simantics.org/redmine/issues/7263). Make a copy of the previous release issue to create the new one. Include link to original issue while copying.
 
@@ -140,7 +154,11 @@ In the following steps, it is recommended to ensure every `.target` file is up-t
         git push origin release/x.y.z[.w]
 
 6. 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](https://www.simantics.org:8088/r/gitweb?p=simantics/platform.git;a=commitdiff;h=ae93c9930c6345c32219e6845b9e72e9d9d2d28c).
+   An example of these changes can be seen in [gitweb](https://www.simantics.org:8088/r/gitweb?p=simantics%2Fplatform.git;a=commit;h=564ac84a2949b19ce5c1c7c838b575527ec42b09) or in [review 1362](https://www.simantics.org:8088/r/#/c/1362). The changes include:
+   * Simantics Desktop splash screen update (version number)
+   * Simantics target platform name to state correct development version
+   * org.simantics.sdk feature version bump
+   * org.simantics.sdk.repository project version bump 
 
    Commit the changes with the following commit message
 
@@ -165,9 +183,9 @@ After this, whenever changes are pushed/merged to `release/x.y.z[.w]` branch in
 
 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](https://www.simantics.org/jenkins/job/SDK/job/Simantics%20SDK/) Jenkins job.
 
-### Update `.target` files
+### Update release-branch `.target` files
 
-Lastly, 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.
+Next, we want to change the `.tpd` and `.target` files to point to the correct P2 repository locations in the release-branch. 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:
 
@@ -175,6 +193,8 @@ Push the changed files to remote again with commit message:
 
     refs #xxxx
 
+See [review 1361](https://www.simantics.org:8088/r/#/c/1361) for an example.
+
 ### Test Release Train build
 
 Trigger an execution of the [simantics-release-train](https://www.simantics.org/jenkins/job/simantics-release-train/) Jenkins job with parameters
@@ -222,6 +242,8 @@ When the release branches are ready for the release, tag them with the tag `vx.y
 
 ## 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:
-- 
2.47.1