1. Topics
  2. [release] Aluminum code freeze

[release] Aluminum code freeze

Robert Varga
 

On 30/07/2020 06:51, Daniel de la Rosa wrote:
Hello TSC and all

We are going to code freeze Aluminum for all Managed Projects ( cut and
lock release branches ) on Monday  August 3rd 2020 at 10 am pst. 
Has this happened yet? I do not see a stable/aluminium branch @aaa...

Regards,
Robert

?
signature.asc

Daniel de la Rosa
 

Hello Robert and all, 

Aluminum branch has been locked 


Thanks

On Mon, Aug 3, 2020 at 11:51 PM Daniel de la Rosa via lists.opendaylight.org <ddelarosa=luminanetworks.com@...> wrote:

Anil. Did this happen  yet ? 

On Mon, Aug 3, 2020 at 11:18 PM Robert Varga <nite@...> wrote:
On 30/07/2020 06:51, Daniel de la Rosa wrote:
> Hello TSC and all
>
> We are going to code freeze Aluminum for all Managed Projects ( cut and
> lock release branches ) on Monday  August 3rd 2020 at 10 am pst. 

Has this happened yet? I do not see a stable/aluminium branch @aaa...

Regards,
Robert

--
Daniel de la Rosa
Customer Support Manager
Lumina Networks Inc.
e: ddelarosa@...
m:  +1 408 7728120



--
Daniel de la Rosa
Customer Support Manager
Lumina Networks Inc.
e: ddelarosa@...
m:  +1 408 7728120
Thanh ha <zxiiro@...>
 

I don't see stable/aluminum branches in the projects yet. I thought we were doing branch cutting now too?

I'm not sure what branch was locked but if no projects have stable/aluminum branches I'm not sure what we are locking.

Regards,
Thanh


On Tue, Aug 4, 2020 at 9:13 PM Daniel de la Rosa <ddelarosa@...> wrote:
Hello Robert and all, 

Aluminum branch has been locked 


Thanks

On Mon, Aug 3, 2020 at 11:51 PM Daniel de la Rosa via lists.opendaylight.org <ddelarosa=luminanetworks.com@...> wrote:
Anil. Did this happen  yet ? 

On Mon, Aug 3, 2020 at 11:18 PM Robert Varga <nite@...> wrote:
On 30/07/2020 06:51, Daniel de la Rosa wrote:
> Hello TSC and all
>
> We are going to code freeze Aluminum for all Managed Projects ( cut and
> lock release branches ) on Monday  August 3rd 2020 at 10 am pst. 

Has this happened yet? I do not see a stable/aluminium branch @aaa...

Regards,
Robert

--
Daniel de la Rosa
Customer Support Manager
Lumina Networks Inc.
e: ddelarosa@...
m:  +1 408 7728120



--
Daniel de la Rosa
Customer Support Manager
Lumina Networks Inc.
e: ddelarosa@...
m:  +1 408 7728120
Robert Varga
 

On 05/08/2020 15:30, Thanh Ha wrote:
I don't see stable/aluminum branches in the projects yet. I thought we
were doing branch cutting now too?

I'm not sure what branch was locked but if no projects have
stable/aluminum branches I'm not sure what we are locking.
Yeah, I think we are losing track of what is actually going on in the
release and what needs to be done.

We probably need to automate this, perphaps have a job which will create
the branches, push version bump patches and then merge them using
supercommitter rights?

Regards,
Robert

?
signature.asc

Luis Gomez
 

Branching is not a problem, the real work is to update all the jenkins jobs after the branching. Some of them need special adjustments, not easy to automate today.

On Aug 5, 2020, at 9:18 AM, Robert Varga <nite@...> wrote:

On 05/08/2020 15:30, Thanh Ha wrote:
I don't see stable/aluminum branches in the projects yet. I thought we
were doing branch cutting now too?

I'm not sure what branch was locked but if no projects have
stable/aluminum branches I'm not sure what we are locking.
Yeah, I think we are losing track of what is actually going on in the
release and what needs to be done.

We probably need to automate this, perphaps have a job which will create
the branches, push version bump patches and then merge them using
supercommitter rights?

Regards,
Robert
Daniel de la Rosa
 

Anil told me via irc that he will take care of Aluminum branch cutting as soon as he starts his new day. Also Thanh is going to start working on it as well


Thank you all

On Wed, Aug 5, 2020 at 10:19 AM Luis Gomez <ecelgp@...> wrote:
Branching is not a problem, the real work is to update all the jenkins jobs after the branching. Some of them need special adjustments, not easy to automate today.

> On Aug 5, 2020, at 9:18 AM, Robert Varga <nite@...> wrote:
>
> On 05/08/2020 15:30, Thanh Ha wrote:
>> I don't see stable/aluminum branches in the projects yet. I thought we
>> were doing branch cutting now too?
>>
>> I'm not sure what branch was locked but if no projects have
>> stable/aluminum branches I'm not sure what we are locking.
>
> Yeah, I think we are losing track of what is actually going on in the
> release and what needs to be done.
>
> We probably need to automate this, perphaps have a job which will create
> the branches, push version bump patches and then merge them using
> supercommitter rights?
>
> Regards,
> Robert
>
>



--
Daniel de la Rosa
Customer Support Manager
Lumina Networks Inc.
e: ddelarosa@...
m:  +1 408 7728120
Robert Varga
 

On 05/08/2020 19:19, Luis Gomez wrote:
Branching is not a problem, the real work is to update all the jenkins jobs after the branching. Some of them need special adjustments, not easy to automate today.
Well, for most projects I witnessed it's just a copy of the first block
-- do we have those specials documented somewhere, or is it just tribal
knowledge? :)

Thanks,
Robert

?
signature.asc

Luis Gomez
 

Not sure if this is tribal knowledge but every release I have to manually patch JJB for some misses:


I have not checked yet the patch for this release.

BR/Luis


On Aug 5, 2020, at 11:49 AM, Robert Varga <nite@...> wrote:

On 05/08/2020 19:19, Luis Gomez wrote:
Branching is not a problem, the real work is to update all the jenkins jobs after the branching. Some of them need special adjustments, not easy to automate today.

Well, for most projects I witnessed it's just a copy of the first block
-- do we have those specials documented somewhere, or is it just tribal
knowledge? :)

Thanks,
Robert
Thanh ha <zxiiro@...>
 

Hi Everyone,

An update of what's happening now. All of the autorelease managed projects should now have their stable/aluminium branches cut. Jobs are not yet available though so "master" will still run aluminium jobs but master is no Silicon and stable/aluminium does not yet have jobs. This is a work in progress and the jobs should be updated as soon as this patch passes verify and get's merged (https://git.opendaylight.org/gerrit/c/releng/builder/+/91887).

Once that goes through I can run the silicon version bump job to bump all of the master branch versions to the next release and at that point branch cutting will effectively be complete.

I will be submitting updated .gitreview patches to all relevant projects to update their stable/aluminium branches appropriately. I'll update again once this is all complete.

Regards,
Thanh


On Wed, Aug 5, 2020 at 1:38 PM Daniel de la Rosa <ddelarosa@...> wrote:
Anil told me via irc that he will take care of Aluminum branch cutting as soon as he starts his new day. Also Thanh is going to start working on it as well


Thank you all

On Wed, Aug 5, 2020 at 10:19 AM Luis Gomez <ecelgp@...> wrote:
Branching is not a problem, the real work is to update all the jenkins jobs after the branching. Some of them need special adjustments, not easy to automate today.

> On Aug 5, 2020, at 9:18 AM, Robert Varga <nite@...> wrote:
>
> On 05/08/2020 15:30, Thanh Ha wrote:
>> I don't see stable/aluminum branches in the projects yet. I thought we
>> were doing branch cutting now too?
>>
>> I'm not sure what branch was locked but if no projects have
>> stable/aluminum branches I'm not sure what we are locking.
>
> Yeah, I think we are losing track of what is actually going on in the
> release and what needs to be done.
>
> We probably need to automate this, perphaps have a job which will create
> the branches, push version bump patches and then merge them using
> supercommitter rights?
>
> Regards,
> Robert
>
>



--
Daniel de la Rosa
Customer Support Manager
Lumina Networks Inc.
e: ddelarosa@...
m:  +1 408 7728120
Thanh ha <zxiiro@...>
 

So a lot of this is actually automated and we have documentation on the branch cutting process here:

So there's a script that will update the JJB jobs templates to the next release but it is finicky. There's a few things it does wrong though including:

* Setting java-version for all projects but some csit jobs require "jre" instead of java-version.
* Duplicates the gerrit-release-merge jobs into the new branch causing JJB to fail due to duplicate job definition. This is something I can fix by moving release management jobs into their own project config. I'll look into this after branch cutting work is complete.
* Injects "java-version" to all jobs regardless of if they are java jobs at all so that needs to be manually resolved too.
* Does not appropriately update the opflex project (this is a snowflake project)

and a few other small things that need a human to inspect.

As for creating branches in all projects we have an autorelease job that will clone every repo and create stable/aluminium branches https://jenkins.opendaylight.org/releng/view/autorelease/job/autorelease-branch-cut/ someone just has to manually run it once a release.

Finally the version bump job that we normally use needs to be run to bump the master branch.

So for the most part things are automated but there's a few steps that need a human to 1) decide when to run the job, and 2) inspect job config to fix issues caused by the jjb update script.

Regards,
Thanh


On Wed, Aug 5, 2020 at 3:16 PM Luis Gomez <ecelgp@...> wrote:
Not sure if this is tribal knowledge but every release I have to manually patch JJB for some misses:


I have not checked yet the patch for this release.

BR/Luis


On Aug 5, 2020, at 11:49 AM, Robert Varga <nite@...> wrote:

On 05/08/2020 19:19, Luis Gomez wrote:
Branching is not a problem, the real work is to update all the jenkins jobs after the branching. Some of them need special adjustments, not easy to automate today.

Well, for most projects I witnessed it's just a copy of the first block
-- do we have those specials documented somewhere, or is it just tribal
knowledge? :)

Thanks,
Robert
Thanh ha <zxiiro@...>
 

Hi Everyone,

Jenkins jobs have been updated with new silicon jobs that build master and Aluminium jobs are now building stable/aluminium.

At this point patches have been proposed to the master branch of all projects to bump the version for Silicon development (https://git.opendaylight.org/gerrit/q/topic:branch-cut-aluminium). This is the final thing that needs to be merged then branch cutting is complete. I've opened a ticket with the LF here (https://jira.linuxfoundation.org/plugins/servlet/theme/portal/2/IT-20353) to request super committer permissions on the master branch so we can merge them quickly.

PTLs if your master branch job passes please feel free to merge the version bump patch so that we can move this along.

Thanks,
Thanh

On Wed, Aug 5, 2020 at 3:21 PM Thanh Ha <zxiiro@...> wrote:
Hi Everyone,

An update of what's happening now. All of the autorelease managed projects should now have their stable/aluminium branches cut. Jobs are not yet available though so "master" will still run aluminium jobs but master is no Silicon and stable/aluminium does not yet have jobs. This is a work in progress and the jobs should be updated as soon as this patch passes verify and get's merged (https://git.opendaylight.org/gerrit/c/releng/builder/+/91887).

Once that goes through I can run the silicon version bump job to bump all of the master branch versions to the next release and at that point branch cutting will effectively be complete.

I will be submitting updated .gitreview patches to all relevant projects to update their stable/aluminium branches appropriately. I'll update again once this is all complete.

Regards,
Thanh

On Wed, Aug 5, 2020 at 1:38 PM Daniel de la Rosa <ddelarosa@...> wrote:
Anil told me via irc that he will take care of Aluminum branch cutting as soon as he starts his new day. Also Thanh is going to start working on it as well


Thank you all

On Wed, Aug 5, 2020 at 10:19 AM Luis Gomez <ecelgp@...> wrote:
Branching is not a problem, the real work is to update all the jenkins jobs after the branching. Some of them need special adjustments, not easy to automate today.

> On Aug 5, 2020, at 9:18 AM, Robert Varga <nite@...> wrote:
>
> On 05/08/2020 15:30, Thanh Ha wrote:
>> I don't see stable/aluminum branches in the projects yet. I thought we
>> were doing branch cutting now too?
>>
>> I'm not sure what branch was locked but if no projects have
>> stable/aluminum branches I'm not sure what we are locking.
>
> Yeah, I think we are losing track of what is actually going on in the
> release and what needs to be done.
>
> We probably need to automate this, perphaps have a job which will create
> the branches, push version bump patches and then merge them using
> supercommitter rights?
>
> Regards,
> Robert
>
>



--
Daniel de la Rosa
Customer Support Manager
Lumina Networks Inc.
e: ddelarosa@...
m:  +1 408 7728120
Anil Belur
 



On Thu, Aug 6, 2020 at 7:19 AM Thanh Ha <zxiiro@...> wrote:
Hi Everyone,

Jenkins jobs have been updated with new silicon jobs that build master and Aluminium jobs are now building stable/aluminium.

At this point patches have been proposed to the master branch of all projects to bump the version for Silicon development (https://git.opendaylight.org/gerrit/q/topic:branch-cut-aluminium). This is the final thing that needs to be merged then branch cutting is complete. I've opened a ticket with the LF here (https://jira.linuxfoundation.org/plugins/servlet/theme/portal/2/IT-20353) to request super committer permissions on the master branch so we can merge them quickly.

PTLs if your master branch job passes please feel free to merge the version bump patch so that we can move this along.

Thanks,
Thanh


Hi all, 

I've granted super committer rights for the master branch (Silicon now) and in the process of merging the version-bump patches for "stable/aluminum". 
Will update here one that is complete.


Thanks,
Anil
Anil Belur
 



On Thu, Aug 6, 2020 at 8:40 AM Anil Belur via lists.opendaylight.org <abelur=linuxfoundation.org@...> wrote:
Hi all, 

I've granted super committer rights for the master branch (Silicon now) and in the process of merging the version-bump patches for "stable/aluminum". 
Will update here one that is complete.


All version bump patches for 'stable/aluminum' are merged now and the master branch is open for development.

Thanks,
Anil 
Thanh ha <zxiiro@...>
 

On Thu, Aug 6, 2020 at 5:50 AM Anil Belur <abelur@...> wrote:
On Thu, Aug 6, 2020 at 8:40 AM Anil Belur via lists.opendaylight.org <abelur=linuxfoundation.org@...> wrote:
Hi all, 

I've granted super committer rights for the master branch (Silicon now) and in the process of merging the version-bump patches for "stable/aluminum". 
Will update here one that is complete.


All version bump patches for 'stable/aluminum' are merged now and the master branch is open for development.

I realized we always forget to also bump the documentation version in project's conf.yaml files. That ends today with this patch https://git.opendaylight.org/gerrit/c/releng/builder/+/92055 to include conf.yaml as part of the version bumping script.

In the meantime I also prepared patches for all the projects to bump their Silicon branches as part of the branch-cut-aluminium topic:


Regards,
Thanh
1 - 14 of 14