[RELENG-81] Improve autorelease-version-bump job to handle branch-cutting Created: 27/Feb/18 Updated: 23/Aug/18 Resolved: 23/Apr/18 |
|
| Status: | Closed |
| Project: | releng |
| Component/s: | Autorelease |
| Affects Version/s: | None |
| Fix Version/s: | None |
| Type: | Story | Priority: | Medium |
| Reporter: | Thanh Ha (zxiiro) | Assignee: | Anil Belur |
| Resolution: | Done | Votes: | 0 |
| Labels: | None | ||
| Remaining Estimate: | Not Specified | ||
| Time Spent: | Not Specified | ||
| Original Estimate: | Not Specified | ||
| Description |
|
The version-bump job currently is only useful for the release workflow but does not handle branch-cutting type of version bumping. We should improve the job-template [0] to have a switch for either: 1) Release mode Runs: lftools version release "$RELEASE_TAG" lftools version bump "$RELEASE_TAG" 2) Branch cutting mode Runs: lftools version bump "$RELEASE_TAG" Another issue we'd have to deal with is the line where we run `git checkout -b branch stream/branch`. When run against the master branch doing this causes an error because we're already on the master branch. |
| Comments |
| Comment by Thanh Ha (zxiiro) [ 27/Feb/18 ] |
|
A year ago I started working on a patch to have a job the does the branch-cutting activities for us. https://git.opendaylight.org/gerrit/55849 Might be worth reviving it. |
| Comment by Thanh Ha (zxiiro) [ 27/Feb/18 ] |
|
Rebased the patch https://git.opendaylight.org/gerrit/55849 and finished it off. This will now give us a job that will create the new stable/branches for us as well as produce the .gitreview patches automatically. This will heavily simplify our branch cutting process. |
| Comment by Thanh Ha (zxiiro) [ 27/Feb/18 ] |
|
We could probably have the branch-cut job automatically launch the version-bump job with the right parameters once we update the version-bump job as described in the description. The branch-cut job on success can automatically launch the version bump job. |
| Comment by Anil Belur [ 28/Feb/18 ] |
|
Having a couple of issues while testing this job on sandbox, with some minor changes... 06:02:23 /w/workspace/autorelease-version-bump-nitrogen/vtn /w/workspace/autorelease-version-bump-nitrogen 06:02:23 + '[' master == stable/nitrogen ']' 06:02:23 + '[' true = true ']' 06:02:23 + git checkout master 06:02:23 Switched to branch 'master' 06:02:23 + popd 06:02:23 /w/workspace/autorelease-version-bump-nitrogen 06:02:23 + git remote -v 06:02:23 origin git://devvexx.opendaylight.org/mirror/releng/autorelease (fetch) 06:02:23 origin git://devvexx.opendaylight.org/mirror/releng/autorelease (push) 06:02:23 + git config --global --add gitreview.username jenkins-releng 06:02:23 + git remote add gerrit ssh://jenkins-releng@devvexx.opendaylight.org:29418/mirror/releng/autorelease 06:02:23 + git remote -v 06:02:23 gerrit ssh://jenkins-releng@devvexx.opendaylight.org:29418/mirror/releng/autorelease (fetch) 06:02:23 gerrit ssh://jenkins-releng@devvexx.opendaylight.org:29418/mirror/releng/autorelease (push) 06:02:23 origin git://devvexx.opendaylight.org/mirror/releng/autorelease (fetch) 06:02:23 origin git://devvexx.opendaylight.org/mirror/releng/autorelease (push) 06:02:23 + git review -s 06:02:24 Problem running 'git remote update gerrit' 06:02:24 Fetching gerrit 06:02:24 ssh: connect to host devvexx.opendaylight.org port 29418: Network is unreachable 06:02:24 fatal: Could not read from remote repository. [j] https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-nitrogen/6/console |
| Comment by Anil Belur [ 28/Feb/18 ] |
|
`opendaylight-jenkins-ssh` credentials are available both on releng and sandbox which is not the issue. However, its not able to connect to gerrit (git.opendaylight.org) because gerrit is clone as devvex.opendaylight.org? |
| Comment by Anil Belur [ 28/Feb/18 ] |
|
I was testing the earlier change with $STREAM == nitrogen, instead should have been testing with $STREAM == "fluorine". WIP: Update autorelease version bump job Branch cutting is going through here: |
| Comment by Anil Belur [ 28/Feb/18 ] |
|
Release workflow test is in progress: https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-nitrogen/9/console |
| Comment by Anil Belur [ 05/Mar/18 ] |
|
Updated the documentation which includes both workflows (manual and automated jobs). |
| Comment by Thanh Ha (zxiiro) [ 05/Mar/18 ] |
|
As mentioned in the 3rd comment [c]. We can save a step by having the branch cut job trigger the version bump job too. Then the step can be simplified to just running 1 job. Can we get that updated? |
| Comment by Anil Belur [ 06/Mar/18 ] |
|
zxiiro Yeah will take care of updating that job and docs. |
| Comment by Thanh Ha (zxiiro) [ 23/Apr/18 ] |
|
abelur is this task complete? |
| Comment by Anil Belur [ 23/Apr/18 ] |
|
Yes, this is |
| Comment by Thanh Ha (zxiiro) [ 23/Aug/18 ] |
|
abelur is this complete? or is there more stuff to do here? |
| Comment by Anil Belur [ 23/Aug/18 ] |
|
This is completed. |