https://jira.opendaylight.org This file is an XML representation of an issue en-us 8.20.10 820010 22-06-2022 https://jira.opendaylight.org/browse/RELENG-81 releng <p>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 <span class="error">&#91;0&#93;</span> to have a switch for either:</p> <p>1) Release mode Runs:</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre>lftools version release "$RELEASE_TAG" lftools version bump "$RELEASE_TAG" </pre> </div></div> <p>2) Branch cutting mode Runs:</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre>lftools version bump "$RELEASE_TAG" </pre> </div></div> <p>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.</p> <p><span class="error">&#91;0&#93;</span> <a href="https://github.com/opendaylight/releng-builder/blob/master/jjb/autorelease/autorelease-templates.yaml#L212-L271" class="external-link" target="_blank" rel="nofollow noopener">https://github.com/opendaylight/releng-builder/blob/master/jjb/autorelease/autorelease-templates.yaml#L212-L271</a></p> RELENG-81

Improve autorelease-version-bump job to handle branch-cutting

Story Medium Closed Done Anil Belur Thanh Ha (zxiiro) Tue, 27 Feb 2018 02:20:42 +0000 Thu, 23 Aug 2018 11:05:54 +0000 Mon, 23 Apr 2018 21:15:44 +0000 Autorelease 0 2 <p>A year ago I started working on a patch to have a job the does the branch-cutting activities for us. <a href="https://git.opendaylight.org/gerrit/55849" class="external-link" target="_blank" rel="nofollow noopener">https://git.opendaylight.org/gerrit/55849</a></p> <p>Might be worth reviving it.</p> <p>Rebased the patch <a href="https://git.opendaylight.org/gerrit/55849" class="external-link" target="_blank" rel="nofollow noopener">https://git.opendaylight.org/gerrit/55849</a> 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.</p> <p>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.</p> <p>Having a couple of issues while testing this job on sandbox, with some minor changes... <br/> why is the `git review -s` returning an error? Tried adding a `git remote add gerrit ...` after</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre>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. </pre> </div></div> <p><span class="error">&#91;j&#93;</span> <a href="https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-nitrogen/6/console" class="external-link" target="_blank" rel="nofollow noopener">https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-nitrogen/6/console</a></p> <p>`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? </p> <p>I was testing the earlier change with $STREAM == nitrogen, instead should have been testing with $STREAM == "fluorine".</p> <p>WIP: Update autorelease version bump job<br/> <a href="https://git.opendaylight.org/gerrit/68854" class="external-link" target="_blank" rel="nofollow noopener">https://git.opendaylight.org/gerrit/68854</a> </p> <p>Branch cutting is going through here:<br/> <a href="https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-fluorine/9/console" class="external-link" target="_blank" rel="nofollow noopener">https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-fluorine/9/console</a></p> <p>Release workflow test is in progress:</p> <p><a href="https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-nitrogen/9/console" class="external-link" target="_blank" rel="nofollow noopener">https://jenkins.opendaylight.org/sandbox/job/autorelease-version-bump-nitrogen/9/console</a></p> <p>Updated the documentation which includes both workflows (manual and automated jobs).</p> <p><a href="https://git.opendaylight.org/gerrit/#/c/68762/" class="external-link" target="_blank" rel="nofollow noopener">https://git.opendaylight.org/gerrit/#/c/68762/</a></p> <p>As mentioned in the 3rd comment <span class="error">&#91;c&#93;</span>. 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?</p> <p><span class="error">&#91;c&#93;</span> <a href="https://jira.opendaylight.org/browse/RELENG-81?focusedCommentId=61235&amp;page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-61235" class="external-link" rel="nofollow">https://jira.opendaylight.org/browse/RELENG-81?focusedCommentId=61235&amp;page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-61235</a></p> <p><a href="https://jira.opendaylight.org/secure/ViewProfile.jspa?name=zxiiro" class="user-hover" rel="zxiiro">zxiiro</a> Yeah will take care of updating that job and docs.</p> <p><a href="https://jira.opendaylight.org/secure/ViewProfile.jspa?name=abelur" class="user-hover" rel="abelur">abelur</a> is this task complete?</p> <p>Yes, this is <del>resolved</del>. Everything except the last part 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. </p> <p><span class="error">&#91;c&#93;</span> <a href="https://jira.opendaylight.org/browse/RELENG-81?focusedCommentId=61235&amp;page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-61235" class="external-link" rel="nofollow">https://jira.opendaylight.org/browse/RELENG-81?focusedCommentId=61235&amp;page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-61235</a></p> <p><a href="https://jira.opendaylight.org/secure/ViewProfile.jspa?name=abelur" class="user-hover" rel="abelur">abelur</a> is this complete? or is there more stuff to do here?</p> <p>This is completed.</p> Development Rank 0|i03atr: