Difference between revisions of "Honeycomb/BranchCutting"

From fd.io
Jump to: navigation, search
(Created page with " == Jenkins == In ci-management/jjb/vpp/vpp.yaml https://git.fd.io/cgit/ci-management/tree/jjb/honeycomb/honeycomb.yaml#n15- add a new ‘stream’ for your new YYMM (exampl...")
 
 
(14 intermediate revisions by 2 users not shown)
Line 2: Line 2:
 
== Jenkins ==
 
== Jenkins ==
  
−
In ci-management/jjb/vpp/vpp.yaml  
+
In ci-management/jjb/honeycomb/honeycomb.yaml
−
https://git.fd.io/cgit/ci-management/tree/jjb/honeycomb/honeycomb.yaml#n15- add a new ‘stream’ for your new YYMM (example: for stable/1609:
+
https://git.fd.io/ci-management/tree/jjb/honeycomb/honeycomb.yaml#n24 - add a new ‘stream’ for your new YYMM (example: for stable/1901:
 
<pre>
 
<pre>
−
- '1609':
+
- '1901':
−
             branch: 'stable/1609’'
+
             branch: 'stable/1901’'
−
             repo-stream-part: 'stable.1609'
+
             repo-stream-part: 'stable.1901'
 
</pre>
 
</pre>
−
(example from vpp: https://git.fd.io/cgit/ci-management/tree/jjb/vpp/vpp.yaml#n26 )
+
(example https://gerrit.fd.io/r/#/c/16919/2/jjb/honeycomb/honeycomb.yaml).
  
−
== Cut Branch ==
+
== Cut branch ==
 +
 
 +
Create a new branch stable/YYMM (example: stable/1901) in the gerrit web UI against the point on master you wish to be cutting the branch (usually HEAD at the time your cutting).
  
−
Create a new branch stable/YYMM (example: stable/1609) in the gerrit web UI against the point on master you wish to be cutting the branch (usually HEAD at the time your cutting).
 
 
https://gerrit.fd.io/r/#/admin/projects/honeycomb,branches
 
https://gerrit.fd.io/r/#/admin/projects/honeycomb,branches
  
−
== Update stable/YYMM Branch ==
+
== Update stable/YYMM branch ==
 +
 
 +
On stable/YYMM (example: stable/1707) prepare a commit which updates the .gitreview to reflect the correct branch.
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17020/2/.gitreview
 +
 
 +
Also update <project-branch> in the release notes.
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17025/
 +
 
 +
Updates the maven versions of honeycomb artifacts to x.YY.MM-RC1 (example: 1.19.01-RC1).
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17039/
 +
 
 +
=== Verify correct jar versions ===
 +
After merge job for version bump patch is finished,
 +
check if artifacts with the correct versions were deployed at:
 +
 
 +
https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/[path to artifact]/
 +
 
 +
Example: https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/common/honeycomb-parent/
 +
 
 +
=== Lay RC1 tag ===
 +
Tag the RC1 bump commit:
 +
 
 +
<pre>
 +
git tag v1.19.01-RC1 -m "Honeycomb v1.19.01-RC1"
 +
</pre>
 +
 
 +
Verify the tag locally:
 +
 
 +
<pre>
 +
git show v1.19.01-RC1
 +
</pre>
 +
 
 +
Push the tag to remote repository:
 +
 
 +
<pre>
 +
git push origin v1.19.01-RC1
 +
</pre>
 +
 
 +
Verify tag was pushed:
 +
https://gerrit.fd.io/r/#/admin/projects/honeycomb,tags
 +
 
 +
=== Set version back to SNAPSHOT ===
 +
 
 +
Set maven versions of honeycomb artifacts back to x.YY.MM-SNAPSHOT (example: 1.19.01-SNAPSHOT)
 +
for new development cycle.
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17040/
 +
 
 +
The honeycomb-merge job builds most current version for given branch,
 +
so make sure previous step was finished successfully.
 +
 
 +
== Update master branch ==
 +
 
 +
On master branch, bump versions of honeycomb artifacts to next version snapshots (example: 1.19.01-SNAPSHOT -> 1.19.04-SNAPSHOT).
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17041/
 +
 
 +
Also create new project version in jira ([https://jira.fd.io/projects/HONEYCOMB?selectedItem=com.atlassian.jira.jira-projects-plugin%3Arelease-page&status=released-unreleased Honeycomb releases]) and update release notes.
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17046/
 +
 
 +
== Release final version ==
 +
 
 +
Prepare release notes, which should reflect Jira tasks for honeycomb project.
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17278/
 +
 
 +
Bump versions to final version (example: 1.19.01-SNAPSHOT -> 1.19.01).
 +
 
 +
Example: https://gerrit.fd.io/r/#/c/17280/
 +
 
 +
=== Verify correct jar versions ===
 +
After merge job for version bump patch is finished,
 +
check if artifacts with the correct versions (example: 1.19.01) were deployed at:
 +
 
 +
https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/[path to artifact]/
 +
 
 +
Example: https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/common/honeycomb-parent/
 +
 
 +
=== Lay Release tag ===
 +
 
 +
Tag the RC1 bump commit:
 +
 
 +
<pre>
 +
git tag v1.19.01 -m "Honeycomb v1.19.01"
 +
</pre>
 +
 
 +
Verify the tag locally:
 +
 
 +
<pre>
 +
git show v1.19.01
 +
</pre>
 +
 
 +
Push the tag to remote repository:
 +
 
 +
<pre>
 +
git push origin v1.19.01
 +
</pre>
 +
 
 +
Verify tag was pushed:
 +
https://gerrit.fd.io/r/#/admin/projects/honeycomb,tags
  
−
On stable/YYMM (example: stable/1609) prepare a commit which updates the .gitreview to reflect the correct branch and updates the maven versions (in a single patch) and the versions used for building rpms/debs
+
=== Set version back to SNAPSHOT ===
−
Example:  https://gerrit.fd.io/r/#/c/1157/1/.gitreview
+
−
Example: https://git.fd.io/cgit/honeycomb/tree/packaging/rpm/version
+
  
−
Merge the patch
+
Bump versions back to Snapshot for next development cycle on stable branch (Example: 1.19.01 -> 1.19.01.1-SNAPSHOT)
  
−
== Verify correct package versions
+
Example: https://gerrit.fd.io/r/#/c/17281/
−
Go look for package with the correct versions at:
+
−
https://nexus.fd.io/content/repositories/fd.io.stable.YYMM.centos7/ ( example: ( https://nexus.fd.io/content/repositories/fd.io.stable.1609.centos7/ )
+
−
https://nexus.fd.io/content/repositories/fd.io.stable.YYMM.ubuntu.trusty.main/ example: ( https://nexus.fd.io/content/repositories/fd.io.stable.1609.ubuntu.trusty.main/ )
+
−
https://nexus.fd.io/content/repositories/fd.io.stable.YYMM.ubuntu.xenial.main/ example: (https://nexus.fd.io/content/repositories/fd.io.stable.1609.ubuntu.xenial.main/ )
+
−
Verify that package like artifacts are present in all the above git repos by looking for them in  ‘Package’ in the apt repos (trusty and xenial)
+

Latest revision as of 08:23, 4 February 2019

Jenkins

In ci-management/jjb/honeycomb/honeycomb.yaml https://git.fd.io/ci-management/tree/jjb/honeycomb/honeycomb.yaml#n24 - add a new ‘stream’ for your new YYMM (example: for stable/1901: 

- '1901':
            branch: 'stable/1901’'
            repo-stream-part: 'stable.1901'

(example https://gerrit.fd.io/r/#/c/16919/2/jjb/honeycomb/honeycomb.yaml).

Cut branch

Create a new branch stable/YYMM (example: stable/1901) in the gerrit web UI against the point on master you wish to be cutting the branch (usually HEAD at the time your cutting).

https://gerrit.fd.io/r/#/admin/projects/honeycomb,branches

Update stable/YYMM branch

On stable/YYMM (example: stable/1707) prepare a commit which updates the .gitreview to reflect the correct branch.

Example: https://gerrit.fd.io/r/#/c/17020/2/.gitreview

Also update <project-branch> in the release notes.

Example: https://gerrit.fd.io/r/#/c/17025/

Updates the maven versions of honeycomb artifacts to x.YY.MM-RC1 (example: 1.19.01-RC1).

Example: https://gerrit.fd.io/r/#/c/17039/

Verify correct jar versions

After merge job for version bump patch is finished, check if artifacts with the correct versions were deployed at:

https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/[path to artifact]/

Example: https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/common/honeycomb-parent/

Lay RC1 tag

Tag the RC1 bump commit: 

git tag v1.19.01-RC1 -m "Honeycomb v1.19.01-RC1"

Verify the tag locally: 

git show v1.19.01-RC1

Push the tag to remote repository: 

git push origin v1.19.01-RC1

Verify tag was pushed: https://gerrit.fd.io/r/#/admin/projects/honeycomb,tags

Set version back to SNAPSHOT

Set maven versions of honeycomb artifacts back to x.YY.MM-SNAPSHOT (example: 1.19.01-SNAPSHOT) for new development cycle.

Example: https://gerrit.fd.io/r/#/c/17040/

The honeycomb-merge job builds most current version for given branch, so make sure previous step was finished successfully.

Update master branch

On master branch, bump versions of honeycomb artifacts to next version snapshots (example: 1.19.01-SNAPSHOT -> 1.19.04-SNAPSHOT).

Example: https://gerrit.fd.io/r/#/c/17041/

Also create new project version in jira (Honeycomb releases) and update release notes.

Example: https://gerrit.fd.io/r/#/c/17046/

Release final version

Prepare release notes, which should reflect Jira tasks for honeycomb project.

Example: https://gerrit.fd.io/r/#/c/17278/

Bump versions to final version (example: 1.19.01-SNAPSHOT -> 1.19.01).

Example: https://gerrit.fd.io/r/#/c/17280/

Verify correct jar versions

After merge job for version bump patch is finished, check if artifacts with the correct versions (example: 1.19.01) were deployed at:

https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/[path to artifact]/

Example: https://nexus.fd.io/content/repositories/fd.io.release/io/fd/honeycomb/common/honeycomb-parent/

Lay Release tag

Tag the RC1 bump commit: 

git tag v1.19.01 -m "Honeycomb v1.19.01"

Verify the tag locally: 

git show v1.19.01

Push the tag to remote repository: 

git push origin v1.19.01

Verify tag was pushed: https://gerrit.fd.io/r/#/admin/projects/honeycomb,tags

Set version back to SNAPSHOT

Bump versions back to Snapshot for next development cycle on stable branch (Example: 1.19.01 -> 1.19.01.1-SNAPSHOT)

Example: https://gerrit.fd.io/r/#/c/17281/

Retrieved from "https://wiki.fd.io/index.php?title=Honeycomb/BranchCutting&oldid=8974"