From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web08.8161.1608213008491685983 for ; Thu, 17 Dec 2020 05:50:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GuYHyp3o; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608213007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hEUem5OsvtcRByG/fJMFblAK+aYL1vrD/nOasIhmBfI=; b=GuYHyp3o+FVoekxy3lV6AO0BWzYQclCObaTOKTKT3bxPaXY/DWqsAA8p5gifnmubP8Roms FXqVevaJSxtm0pPM/MnVl+u6MutSLtGq4mZVYzK9gbOHgRa99QNYhYoeVejHFxv9ELAUAj Bt4AbO3dSzS9VmmkooSTQkjAm1Jv8Bc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-543-UV_h3vkMMfGr2s0-BKVemg-1; Thu, 17 Dec 2020 08:49:55 -0500 X-MC-Unique: UV_h3vkMMfGr2s0-BKVemg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7635D100C673; Thu, 17 Dec 2020 13:49:30 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-115-40.ams2.redhat.com [10.36.115.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB92D1A353; Thu, 17 Dec 2020 13:49:28 +0000 (UTC) Subject: Re: [RFC V2] Create supported branch from edk2-stable* tag (Required to address critical bug BZ3111) To: "Kinney, Michael D" , "devel@edk2.groups.io" , "rfc@edk2.groups.io" , "gaoliming@byosoft.com.cn" , "Andrew Fish (afish@apple.com)" , Leif Lindholm , 'Sean Brogan' , 'Bret Barkelew' References: From: "Laszlo Ersek" Message-ID: Date: Thu, 17 Dec 2020 14:49:27 +0100 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 12/16/20 01:24, Kinney, Michael D wrote: > Hello, > > The following bug has been fixed on edk2/master > > https://bugzilla.tianocore.org/show_bug.cgi?id=3111 > https://github.com/tianocore/edk2/pull/1226 > > This bug is also considered a critical bug against edk2-stable202011. The behavior > of the Variable Lock Protocol was changed in a non-backwards compatible manner in > edk2-stable202011 and this is impacting some downstream platforms. The following > 2 commits on edk2/master restore the original behavior of the Variable Lock Protocol. > > https://github.com/tianocore/edk2/pull/1226/commits/893cfe2847b83da74f53858d6acaa15a348bad7c > https://github.com/tianocore/edk2/pull/1226/commits/16491ba6a6e9a91cedeeed45bc0fbdfde49f7968 > > The request here is to create a supported branch from edk2-stable202011 tag and apply > these 2 commits as critical bug fixes on the supported branch. > > Since we started using the edk2-stable* tag process, there has not been a request to create > a supported branch from one of those tags. As a result, there are a couple opens that > need to be addressed: > > 1) Supported branch naming convention. > > Proposal: stable/ > Example: stable/202011 > > 2) CI requirements for supported branches. > > Proposal: Update .azurepipelines yml files to also trigger on stable/* branches > and update GitHub settings so stable/* branches are protected branches. > > 3) Release requirements for supported branches. > > Proposal: If there are a significant number of critical fixes applied to > a stable/edk2-stable* branch, then a request for a release can be made that > would trigger focused testing of the supported branch and creation of a new > release. If all testing passes, then a tag is created on the stable/edk2-stable* > branch and a release is created on GitHub that summarizes the set of critical > fixes and the testing performed. > > Proposal: edk2-stable. > Example : edk2-stable201111.01 > > Please let me know if you have any feedback or comments on this proposal. The goal > is to close on this topic this week. - Looks good; just a typo in the example: "edk2-stable201111.01" should use 2020, not 2011. - I agree with Liming that stable branches should have a predefined lifetime. Keeping stable branches regression-free is very difficult and ungrateful work, and the community should not have expectations that we're going to do "LTS" branches. That's too resource hungry; companies have dedicated "maintenance engineer" positions for that. Here's an example stable process: https://git.qemu.org/?p=qemu.git;a=blob_plain;f=docs/devel/stable-process.rst;hb=HEAD I would recommend that, initially, we only promise support for the last stable tag's branch. - Including a unit test (if it exists) with the actual bugfix on a stable branch seems important to me. Thanks Laszlo