From patchwork Wed May 31 13:58:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HYodHviP; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8C25dHz20QB for ; Wed, 31 May 2023 23:58:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2DF3041DDA; Wed, 31 May 2023 13:58:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2DF3041DDA Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HYodHviP X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IXKyK_W7Varu; Wed, 31 May 2023 13:58:47 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id A984D405F1; Wed, 31 May 2023 13:58:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A984D405F1 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7AC7BC0088; Wed, 31 May 2023 13:58:46 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 66531C0037 for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 416FC60E48 for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 416FC60E48 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HYodHviP X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y13a9K7iZ4QK for ; Wed, 31 May 2023 13:58:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7D27C60A7A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7D27C60A7A for ; Wed, 31 May 2023 13:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541522; 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=8HvQP6nLOQrFJu9dE79lppw4ySrdondyNGWBy+Gd/J4=; b=HYodHviPbrY42cKY3GGZ28a9Z9z0R187gi5AN15VuTAzFBASsGnerFbZ8AuZbV0sOwcMPo Z7mCv78psgeDvHJZeqqnnqh2CMirIFZ80q7RkmNq9R+6YMAUfgXaVigR1jDqvsxxn+4Pgx LUiabPgzTgrYTvpV74M0KEZZCdIyvYw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-KZyWU8dAMTq6IEZReEc46A-1; Wed, 31 May 2023 09:58:41 -0400 X-MC-Unique: KZyWU8dAMTq6IEZReEc46A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62CDC3C0D844 for ; Wed, 31 May 2023 13:58:41 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03FEC40C6EC4 for ; Wed, 31 May 2023 13:58:40 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:31 -0400 Message-Id: <20230531135839.2517727-2-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 1/9] release-process: Use more accurate example releases. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" We don't use a four-digit major version, just the final two digits of the year. Signed-off-by: Mark Michelson --- Documentation/internals/release-process.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index 848c2db84..d9aabf8d1 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -50,7 +50,7 @@ Scheduling`_ for the timing of each stage: Please propose and discuss exceptions on ovs-dev. 2. Fork a release branch from main, named for the expected release number, - e.g. "branch-2019.10" for the branch that will yield OVN 2019.10.x. + e.g. "branch-25.09" for the branch that will yield OVN 25.09.x. Release branches are intended for testing and stabilization. At this stage and in later stages, they should receive only bug fixes, not new features. @@ -65,14 +65,14 @@ Scheduling`_ for the timing of each stage: and risk and discussed on ovs-dev before creating the branch. 3. When committers come to rough consensus that the release is ready, they - release the .0 release on its branch, e.g. 2019.10.0 for branch-2019.10. To + release the .0 release on its branch, e.g. 25.09.0 for branch-25.09. To make the actual release, a committer pushes a signed tag named, e.g. - v2019.10.0, to the OVN repository, makes a release tarball available on + v25.09.0, to the OVN repository, makes a release tarball available on openvswitch.org, and posts a release announcement to ovs-announce. 4. As bug fixes accumulate, or after important bugs or vulnerabilities are - fixed, committers may make additional releases from a branch: 2019.10.1, - 2019.10.2, and so on. The process is the same for these additional release + fixed, committers may make additional releases from a branch: 25.09.1, + 25.09.2, and so on. The process is the same for these additional release as for a .0 release. .. _long-term-support: From patchwork Wed May 31 13:58:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IYCDBfSJ; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8L1Kzpz20QB for ; Wed, 31 May 2023 23:58:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 339F7819BE; Wed, 31 May 2023 13:58:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 339F7819BE Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IYCDBfSJ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id huYVwxpwilQR; Wed, 31 May 2023 13:58:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1B00882EB6; Wed, 31 May 2023 13:58:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1B00882EB6 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1F313C008E; Wed, 31 May 2023 13:58:52 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id DF29EC0088 for ; Wed, 31 May 2023 13:58:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A5656606EC for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A5656606EC Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IYCDBfSJ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u-B4DaCmOUkt for ; Wed, 31 May 2023 13:58:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6B88460750 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 6B88460750 for ; Wed, 31 May 2023 13:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541523; 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=+TRYOl/aDbfAcBTRu6PlldxXiBq+Roye1Lr5niPOR6k=; b=IYCDBfSJHz2Te1PDlSmLs1wkbGOK7sHyPVxVLNW+8dca22KtoegCvNtfd8UxQdGGlJN2Gd QtvLchKpQeZ2yb5yDzpp6NqjFUdzqyc0n0VNa7nC7fm+YqzEcr02UfCY1/a9FEXWIoSA+t v94zNqjOS/+KJNH34prSzKZR8OOxA7g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-480-Vyd0-RuhP4eK3HSwQLAJZQ-1; Wed, 31 May 2023 09:58:42 -0400 X-MC-Unique: Vyd0-RuhP4eK3HSwQLAJZQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 059DA85A5A8 for ; Wed, 31 May 2023 13:58:42 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BC0240C6EC4 for ; Wed, 31 May 2023 13:58:41 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:32 -0400 Message-Id: <20230531135839.2517727-3-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 2/9] release-process: Switch to two releases per year. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Based on discussions that have occurred on the development mailing list and public IRC meetings, we have decided to reduce OVN to having two releases per year instead of four. When OVN initially spun off from OVS, the amount of feature requests and performance improvements were happening at a rapid pace. Releasing every three months made it possible to get these changes released rapidly. OVN has reached a point now where the number of new features has decreased. And the new features being requested are more complex and could use a longer lead time to be implemented. Therefore, this change makes OVN's release policy change to having two releases per year instead of four. Given that we now have a longer time between releases, this change also gives a longer time for soft freeze and testing the branches before release. Signed-off-by: Mark Michelson --- Documentation/internals/release-process.rst | 23 ++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index d9aabf8d1..36ee52299 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -120,19 +120,19 @@ with an unspecified date. Release Scheduling ------------------ -OVN makes releases at the following three-month cadence. All dates are +OVN makes releases at the following six-month cadence. All dates are approximate: +---------------+---------------------+--------------------------------------+ | Time (months) | Example Dates | Stage | +---------------+---------------------+--------------------------------------+ -| T | Dec 1, Mar 1, ... | Begin x.y release cycle | +| T | Mar 1, Sep 1, ... | Begin x.y release cycle | +---------------+---------------------+--------------------------------------+ -| T + 2 | Feb 1, May 1, ... | "Soft freeze" main for x.y release | +| T + 4.5 | Jul 15, Jan 15, ... | "Soft freeze" main for x.y release | +---------------+---------------------+--------------------------------------+ -| T + 2.5 | Feb 15, May 15, ... | Fork branch-x.y from main | +| T + 5 | Aug 1, Feb 1, ... | Fork branch-x.y from main | +---------------+---------------------+--------------------------------------+ -| T + 3 | Mar 1, Jun 1, ... | Release version x.y.0 | +| T + 6 | Sep 1, Mar 1, ... | Release version x.y.0 | +---------------+---------------------+--------------------------------------+ Release Calendar @@ -140,7 +140,8 @@ Release Calendar The 2023 timetable is shown below. Note that these dates are not set in stone. If extenuating circumstances arise, a release may be delayed from its target -date. +date. Also note that the release policy changed partway through 2023, which is +why the release dates and timetables do not line up with the example above. +---------+-------------+-----------------+---------+ | Release | Soft Freeze | Branch Creation | Release | @@ -151,21 +152,15 @@ date. +---------+-------------+-----------------+---------+ | 23.09.0 | Aug 4 | Aug 18 | Sep 1 | +---------+-------------+-----------------+---------+ -| 23.12.0 | Nov 3 | Nov 17 | Dec 1 | -+---------+-------------+-----------------+---------+ Below is the 2024 timetable +---------+-------------+-----------------+---------+ | Release | Soft Freeze | Branch Creation | Release | +---------+-------------+-----------------+---------+ -| 24.03.0 | Feb 2 | Feb 16 | Mar 1 | -+---------+-------------+-----------------+---------+ -| 24.06.0 | May 10 | May 24 | Jun 7 | -+---------+-------------+-----------------+---------+ -| 24.09.0 | Aug 9 | Aug 23 | Sep 6 | +| 24.03.0 | Jan 19 | Feb 2 | Mar 1 | +---------+-------------+-----------------+---------+ -| 24.12.0 | Nov 8 | Nov 22 | Dec 6 | +| 24.09.0 | Jul 19 | Aug 2 | Sep 6 | +---------+-------------+-----------------+---------+ Contact From patchwork Wed May 31 13:58:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788373 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BPg6hvNa; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8H3fFLz20QB for ; Wed, 31 May 2023 23:58:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6ED50830FB; Wed, 31 May 2023 13:58:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6ED50830FB Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BPg6hvNa X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k0ATMtrweGWN; Wed, 31 May 2023 13:58:52 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6B28881CD0; Wed, 31 May 2023 13:58:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6B28881CD0 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3DE70C007C; Wed, 31 May 2023 13:58:51 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9DEA2C008D for ; Wed, 31 May 2023 13:58:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8B4DB81465 for ; Wed, 31 May 2023 13:58:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8B4DB81465 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mwosEzIwrdKe for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5D1CF81430 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5D1CF81430 for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541524; 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=2X0V0Sbas+VzxrQVSD8bBr9x13egqWNFnpl29WJAZWI=; b=BPg6hvNaQYXphEbL3z9gKA40PWy4cjgi60Ht+23jeEAzYyGweTnHJKGl6C20GNWohol8EX BOex3yTbwBCeMUuDX9YBqr+XUoMJSf0IEgYMhhSE6hIrcz1OU9sgXgr4dCsb78LKax28QG mzb/X7qHvT+tY1cUL06czOr4GM5bnsQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-2-Ohg7kONlSfgOuCYYbMRg-1; Wed, 31 May 2023 09:58:42 -0400 X-MC-Unique: 2-Ohg7kONlSfgOuCYYbMRg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9AB5A3813F24 for ; Wed, 31 May 2023 13:58:42 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F88C40C6EC4 for ; Wed, 31 May 2023 13:58:42 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:33 -0400 Message-Id: <20230531135839.2517727-4-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 3/9] release-policy: Change "release" to "version" in LTS section. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Upcoming changes to the documentation will add documentation for standard term support versions and will document a policy for when releases are made for these versions. Our current use of "release" in the documentation is interchangeable with "version" but upcoming changes will differentiate these more clearly. Signed-off-by: Mark Michelson --- Documentation/internals/release-process.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index 36ee52299..fca93d5a8 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -77,21 +77,21 @@ Scheduling`_ for the timing of each stage: .. _long-term-support: -Long-term Support Releases +Long-term Support Versions -------------------------- -The OVN project will periodically designate a release as "long-term support" or -LTS for short. An LTS release has the distinction of being maintained for -longer than a standard release. +The OVN project will periodically designate a version as "long-term support" or +LTS for short. An LTS version has the distinction of being maintained for +longer than a standard version. -LTS releases will receive bug fixes until the point that another LTS is +LTS versions will receive bug fixes until the point that another LTS is released. At that point, the old LTS will receive an additional year of critical and security fixes. Critical fixes are those that are required to ensure basic operation (e.g. memory leak fixes, crash fixes). Security fixes are those that address concerns about exploitable flaws in OVN and that have a corresponding CVE report. -LTS releases are scheduled to be released once every two years. This means +LTS versions are scheduled to be created once every two years. This means that any given LTS will receive bug fix support for two years, followed by one year of critical bug fixes and security fixes. From patchwork Wed May 31 13:58:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788375 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ETWyB5BH; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8M283Cz20QB for ; Wed, 31 May 2023 23:58:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 55669613DC; Wed, 31 May 2023 13:58:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 55669613DC Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ETWyB5BH X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zTO9e47xWVJA; Wed, 31 May 2023 13:58:56 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id BC93F613B6; Wed, 31 May 2023 13:58:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BC93F613B6 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E0062C0092; Wed, 31 May 2023 13:58:52 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id CF6FFC0090 for ; Wed, 31 May 2023 13:58:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id ABC8181430 for ; Wed, 31 May 2023 13:58:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org ABC8181430 Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ETWyB5BH X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZP-OUWI4uEcn for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 88EBE8143A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 88EBE8143A for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541524; 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=VzGv7Z7VevbHj0EDzbhyrdPqeq/yWdfhQU0KjTxlyeQ=; b=ETWyB5BHoktV88Nw2ZjyRVitaW8eTjtF3SlCJLwmnzYXvsvoQELPTctFFJXkU5/zHP2sE4 aaehHnXGnLw/YYeNZqaLaqRePzGpqd95ZQy8m8fSs3PvCl/lfFfJ59oy5nmTCTk5Ov/W+c 0t6nM/Od1SqFI5JXX75B4IG3kwcEoNU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-224-Q60g8VkbNEKQvnK6aPXSEA-1; Wed, 31 May 2023 09:58:43 -0400 X-MC-Unique: Q60g8VkbNEKQvnK6aPXSEA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F261185A793 for ; Wed, 31 May 2023 13:58:43 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id D494340C6EC4 for ; Wed, 31 May 2023 13:58:42 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:34 -0400 Message-Id: <20230531135839.2517727-5-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 4/9] release-process: State release policy for LTS versions. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The definition of "regular releases" is being kept purposely vague in this commit because a later commit will define what the interval is for these releases. Signed-off-by: Mark Michelson --- Documentation/internals/release-process.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index fca93d5a8..7a3b02497 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -84,12 +84,13 @@ The OVN project will periodically designate a version as "long-term support" or LTS for short. An LTS version has the distinction of being maintained for longer than a standard version. -LTS versions will receive bug fixes until the point that another LTS is -released. At that point, the old LTS will receive an additional year of +LTS versions will have releases made regularly until the point that another +LTS is released. At that point, the old LTS will receive an additional year of critical and security fixes. Critical fixes are those that are required to ensure basic operation (e.g. memory leak fixes, crash fixes). Security fixes are those that address concerns about exploitable flaws in OVN and that have a -corresponding CVE report. +corresponding CVE report. Whenever such a fix is applied, a new release will +be made for the LTS version. LTS versions are scheduled to be created once every two years. This means that any given LTS will receive bug fix support for two years, followed by From patchwork Wed May 31 13:58:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EFcvNpL7; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8V5mflz20QB for ; Wed, 31 May 2023 23:59:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5E06D6143A; Wed, 31 May 2023 13:59:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5E06D6143A Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EFcvNpL7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8mnN6m48P-vy; Wed, 31 May 2023 13:59:02 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0E4DB613EC; Wed, 31 May 2023 13:59:00 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0E4DB613EC Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9C213C0094; Wed, 31 May 2023 13:58:56 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 719C2C008C for ; Wed, 31 May 2023 13:58:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8E0DF8146D for ; Wed, 31 May 2023 13:58:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8E0DF8146D Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EFcvNpL7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lm99VP-mYhEJ for ; Wed, 31 May 2023 13:58:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 719578144D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 719578144D for ; Wed, 31 May 2023 13:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541525; 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=FGOI5O97JH/eFJ0MsK5oM6bZMz6XtwxmkE0F+eJBZxY=; b=EFcvNpL7pHM9QvDtoZUju5O9TK7igvG8vbo+KDiJxsMHvSB2BQINlxCruT9+S88c+PKKJ8 wvg238EQWAsQz8gXknsddOsiRA1f3eEdB+2sqfqWZ5RNqEfbbzFfLMNr/2ZXqKvXoRCgfr Yxo6nz/9ARE7QqAJSDs2DydAxSq+Yso= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-18-YRrsSuG0NT6B0H0Z_jHAFw-1; Wed, 31 May 2023 09:58:44 -0400 X-MC-Unique: YRrsSuG0NT6B0H0Z_jHAFw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B24B2858F1C for ; Wed, 31 May 2023 13:58:43 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61B2F40C6CD0 for ; Wed, 31 May 2023 13:58:43 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:35 -0400 Message-Id: <20230531135839.2517727-6-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 5/9] release-process: Add section for standard-term support releases. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Mark Michelson --- Documentation/internals/release-process.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index 7a3b02497..51e9d13da 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -99,6 +99,22 @@ one year of critical bug fixes and security fixes. The current LTS version is documented on the `Long Term Support Releases`__ page of `ovn.org`__. +Standard-term Support Versions +------------------------------ + +Versions of OVN that are not designated as LTS versions are standard-term +support releases. + +Standard term support versions will have releases made regularly for one year. +There are no additional windows for which releases will be made for critical +or security fixes. + +The branches for standard term support versions may receive bug fixes and +critical and security fixes after the OVN team has stopped creating regular +releases. This is strictly to facilitate easy backporting of fixes to LTS +versions that are still receiving regular releases. Even though the branch may +receive additional fixes, no releases will be made with these fixes. + Release Numbering ----------------- From patchwork Wed May 31 13:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788380 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gAbe2wjZ; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8l4xzzz20QB for ; Wed, 31 May 2023 23:59:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 536CA429CD; Wed, 31 May 2023 13:59:17 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 536CA429CD Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gAbe2wjZ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LOkayFrkz9Iu; Wed, 31 May 2023 13:59:14 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 55DF741DF5; Wed, 31 May 2023 13:59:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 55DF741DF5 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5B08AC0091; Wed, 31 May 2023 13:59:01 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0F896C00A0 for ; Wed, 31 May 2023 13:59:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CCAE1613E4 for ; Wed, 31 May 2023 13:58:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CCAE1613E4 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gAbe2wjZ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y5NRLrpuj4H4 for ; Wed, 31 May 2023 13:58:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 36099613B3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 36099613B3 for ; Wed, 31 May 2023 13:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541533; 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=2E/id0qIE2MelBxY/AFyUxVwNu7ULCgnFrvfbW4guKQ=; b=gAbe2wjZfo9JWaklW77K2e6VOpr4vvTuxOePbEmjlCLZ55oBP/ghonjxbKg0dbeMuvkRSa LF3fTsNfjQNPNUk5G6nsbgqCq1A1+R6yv8z40cfhStsLjdJMhHopnLT5Ba0bMLd8piqxu8 6wcouF4/cEfIcCWId3hEFKJHr4MrnKg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-354-bCrtUfG8OfGMGgeMted4tQ-1; Wed, 31 May 2023 09:58:44 -0400 X-MC-Unique: bCrtUfG8OfGMGgeMted4tQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4AD4E185A7A7 for ; Wed, 31 May 2023 13:58:44 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id E374A40C6CD6 for ; Wed, 31 May 2023 13:58:43 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:36 -0400 Message-Id: <20230531135839.2517727-7-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 6/9] release-policy: Document when versions receive new releases. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The OVN team has had no concrete policy regarding when releases are made for a given version. In the past, new releases have been made only when something critical has been found, meaning that most bug fixes applied to a given OVN version never end up in a release. This change proposes a monthly release per supported OVN version. Signed-off-by: Mark Michelson --- Documentation/internals/release-process.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index 51e9d13da..b4387b5dd 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -152,6 +152,12 @@ approximate: | T + 6 | Sep 1, Mar 1, ... | Release version x.y.0 | +---------------+---------------------+--------------------------------------+ +After the .0 release is created for a given OVN version, that version will have +releases made every month until its support lifetime has concluded. If for some +reason, no changes occur to a supported OVN version during a month, then no +release will be made that month. Therefore, there is no guarantee about the +exact number of releases to be expected for any given OVN version. + Release Calendar ---------------- From patchwork Wed May 31 13:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788376 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PTD0Hrr6; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8N4ry4z20QB for ; Wed, 31 May 2023 23:59:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D786F83777; Wed, 31 May 2023 13:58:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D786F83777 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PTD0Hrr6 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 092FKgjEQT5N; Wed, 31 May 2023 13:58:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 540738345D; Wed, 31 May 2023 13:58:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 540738345D Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id DC04FC0088; Wed, 31 May 2023 13:58:53 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id E6388C008C for ; Wed, 31 May 2023 13:58:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A079341579 for ; Wed, 31 May 2023 13:58:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A079341579 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PTD0Hrr6 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ag5RmKsViW3t for ; Wed, 31 May 2023 13:58:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6F4FD40919 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6F4FD40919 for ; Wed, 31 May 2023 13:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541526; 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=GO+Kf2uczWB9ESrZQ8uPRNpFlgD6Ur3GtHmAqMXTSsI=; b=PTD0Hrr6GmUBrc1UsnVMndMgybwWw3znxSGQJ+imJ5rYq4bh2Sl5iFNcOqG9eaFUUP8/BN InP0Dx90aIb01XhfhDzVw6bjA/XPNr2MK2neOfY+337LkUuMs9iOBpoKfM4BMCEZeHICTC egxonIIV0H8gq4C8bCGrAn297BA3LRs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-99-DEFkEWKyM4uYu2zunAnf0Q-1; Wed, 31 May 2023 09:58:45 -0400 X-MC-Unique: DEFkEWKyM4uYu2zunAnf0Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D957385A5BD for ; Wed, 31 May 2023 13:58:44 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8540340C6EC4 for ; Wed, 31 May 2023 13:58:44 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:37 -0400 Message-Id: <20230531135839.2517727-8-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 7/9] Documentation: Change "master" to "main". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" OVN hasn't used the name "master" for quite a while, and it looks like we missed some documents when the change to "main" was made. Signed-off-by: Mark Michelson --- .../internals/committer-grant-revocation.rst | 2 +- .../internals/committer-responsibilities.rst | 8 ++++---- .../internals/contributing/backporting-patches.rst | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/internals/committer-grant-revocation.rst b/Documentation/internals/committer-grant-revocation.rst index 49c7769b8..d2c0e0447 100644 --- a/Documentation/internals/committer-grant-revocation.rst +++ b/Documentation/internals/committer-grant-revocation.rst @@ -26,7 +26,7 @@ OVN Committer Grant/Revocation Policy ===================================== An OVN committer is a participant in the project with the ability to commit -code directly to the master repository. Commit access grants a broad ability to +code directly to the main repository. Commit access grants a broad ability to affect the progress of the project as presented by its most important artifact, the code and related resources that produce working binaries of OVN As such it represents a significant level of trust in an individual's diff --git a/Documentation/internals/committer-responsibilities.rst b/Documentation/internals/committer-responsibilities.rst index 1280076ad..40c1e737a 100644 --- a/Documentation/internals/committer-responsibilities.rst +++ b/Documentation/internals/committer-responsibilities.rst @@ -73,14 +73,14 @@ If it is someone else's change, then you can ask the original submitter to address it. Regardless, you need to ensure that the problem is fixed in a timely way. The definition of "timely" depends on the severity of the problem. -If a bug is present on master and other branches, fix it on master first, then +If a bug is present on main and other branches, fix it on main first, then backport the fix to other branches. Straightforward backports do not require -additional review (beyond that for the fix on master). +additional review (beyond that for the fix on main). -Feature development should be done only on master. Occasionally it makes sense +Feature development should be done only on main. Occasionally it makes sense to add a feature to the most recent release branch, before the first actual release of that branch. These should be handled in the same way as bug fixes, -that is, first implemented on master and then backported. +that is, first implemented on main and then backported. Keep the authorship of a commit clear by maintaining a correct list of "Signed-off-by:"s. If a confusing situation comes up, as it occasionally does, diff --git a/Documentation/internals/contributing/backporting-patches.rst b/Documentation/internals/contributing/backporting-patches.rst index fbc200bfc..711a8e36b 100644 --- a/Documentation/internals/contributing/backporting-patches.rst +++ b/Documentation/internals/contributing/backporting-patches.rst @@ -43,24 +43,24 @@ within OVN, but is broadly applied in the following fashion: - Maintainers backport changes from a development branch to release branches. With regards to OVN user space code and code that does not comprise -the Linux datapath and compat code, the development branch is `master` in the +the Linux datapath and compat code, the development branch is `main` in the OVN repository. Patches are applied first to this branch, then to the most recent `branch-X.Y`, then earlier `branch-X.Z`, and so on. The most common -kind of patch in this category is a bugfix which affects master and other +kind of patch in this category is a bugfix which affects main and other branches. Changes to userspace components ------------------------------- Patches which are fixing bugs should be considered for backporting from -`master` to release branches. OVN contributors submit their patches -targeted to the `master` branch, using the ``Fixes`` tag described in -:doc:`submitting-patches`. The maintainer first applies the patch to `master`, +`main` to release branches. OVN contributors submit their patches +targeted to the `main` branch, using the ``Fixes`` tag described in +:doc:`submitting-patches`. The maintainer first applies the patch to `main`, then backports the patch to each older affected tree, as far back as it goes or at least to all currently supported branches. This is usually each branch back to the most recent LTS release branch. -If the fix only affects a particular branch and not `master`, contributors +If the fix only affects a particular branch and not `main`, contributors should submit the change with the target branch listed in the subject line of the patch. Contributors should list all versions that the bug affects. The ``git format-patch`` argument ``--subject-prefix`` may be used when posting the From patchwork Wed May 31 13:58:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KGF74yKm; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8R5vQ6z20QB for ; Wed, 31 May 2023 23:59:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E14F661426; Wed, 31 May 2023 13:59:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E14F661426 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KGF74yKm X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oH9kISvYyKCJ; Wed, 31 May 2023 13:58:59 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 53D4E613A6; Wed, 31 May 2023 13:58:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 53D4E613A6 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 15D9CC0090; Wed, 31 May 2023 13:58:55 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2A098C0092 for ; Wed, 31 May 2023 13:58:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E489A41DDA for ; Wed, 31 May 2023 13:58:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E489A41DDA Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KGF74yKm X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vcN7_40j4PP4 for ; Wed, 31 May 2023 13:58:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1A5C241D7B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id 1A5C241D7B for ; Wed, 31 May 2023 13:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541527; 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=rdbXp/bclgqrg0v1ojJTqmVRZVgBgNdrfcOlabtNObA=; b=KGF74yKmQoqMcb8sqcmjQuM8cvT1qAidutmZhVZmNPnrBJaPBpC2uKolrXtFZur0mWnpj7 8WrKlXdM9WrT42ka5H7NszeihqQZV6g5RHZWO1Hcc+8tRE3ggsZ92JR2Sjw03ALr7Qx/9m TylS2RqBZf5TUSiMdGRHEf1jZ1/0sok= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-219-iu7KdpnRNY-l5QpSuBRPgw-1; Wed, 31 May 2023 09:58:45 -0400 X-MC-Unique: iu7KdpnRNY-l5QpSuBRPgw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70485280228D for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 208F040C6CD0 for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:38 -0400 Message-Id: <20230531135839.2517727-9-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 8/9] backporting-patches: Fix inaccuracies in the document. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This document appears to be based on the OVS document, but things are done slightly differently in OVN. * OVN is 100% userspace, so there is no need to clarify "userspace" anywhere. * The commit message example is not how we do things in OVN. Backport commit messages are typically identical to the original commit message, so there is nothing to specify. * Linus is not involved in OVN's development :) Signed-off-by: Mark Michelson --- .../contributing/backporting-patches.rst | 56 ++++--------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/Documentation/internals/contributing/backporting-patches.rst b/Documentation/internals/contributing/backporting-patches.rst index 711a8e36b..d7e4522cf 100644 --- a/Documentation/internals/contributing/backporting-patches.rst +++ b/Documentation/internals/contributing/backporting-patches.rst @@ -42,23 +42,21 @@ within OVN, but is broadly applied in the following fashion: development branch. - Maintainers backport changes from a development branch to release branches. -With regards to OVN user space code and code that does not comprise -the Linux datapath and compat code, the development branch is `main` in the -OVN repository. Patches are applied first to this branch, then to the -most recent `branch-X.Y`, then earlier `branch-X.Z`, and so on. The most common -kind of patch in this category is a bugfix which affects main and other -branches. +The development branch is `main` in the OVN repository. Patches are applied +first to this branch, then to the most recent `branch-X.Y`, then earlier +`branch-X.Z`, and so on. The most common kind of patch in this category is +a bugfix which affects main and other branches. -Changes to userspace components -------------------------------- +Backport Policy +--------------- Patches which are fixing bugs should be considered for backporting from `main` to release branches. OVN contributors submit their patches -targeted to the `main` branch, using the ``Fixes`` tag described in +targeted to the `main` branch, using the ``Fixes`` tag desribed in :doc:`submitting-patches`. The maintainer first applies the patch to `main`, -then backports the patch to each older affected tree, as far back as it goes or -at least to all currently supported branches. This is usually each branch back -to the most recent LTS release branch. +then backports the patch to each older affected tree, as far back as it goes +or at least to all currently supported branches. This is usually each branch +back to the most recent LTS release branch. If the fix only affects a particular branch and not `main`, contributors should submit the change with the target branch listed in the subject line of @@ -79,39 +77,7 @@ Submission ~~~~~~~~~~ Once the patches are all assembled and working on the OVN tree, they -need to be formatted again using ``git format-patch``. The common format for -commit messages for Linux backport patches is as follows: - -:: - - datapath: Remove incorrect WARN_ONCE(). - - Upstream commit: - commit c6b2aafffc6934be72d96855c9a1d88970597fbc - Author: Jarno Rajahalme - Date: Mon Aug 1 19:08:29 2016 -0700 - - openvswitch: Remove incorrect WARN_ONCE(). - - ovs_ct_find_existing() issues a warning if an existing conntrack entry - classified as IP_CT_NEW is found, with the premise that this should - not happen. However, a newly confirmed, non-expected conntrack entry - remains IP_CT_NEW as long as no reply direction traffic is seen. This - has resulted into somewhat confusing kernel log messages. This patch - removes this check and warning. - - Fixes: 289f2253 ("openvswitch: Find existing conntrack entry after upcall.") - Suggested-by: Joe Stringer - Signed-off-by: Jarno Rajahalme - Acked-by: Joe Stringer - - Signed-off-by: Jarno Rajahalme - -The upstream commit SHA should be the one that appears in Linus' tree so that -reviewers can compare the backported patch with the one upstream. Note that -the subject line for the backported patch replaces the original patch's -``openvswitch`` prefix with ``datapath``. Patches which only affect the -``datapath/linux/compat`` directory should be prefixed with ``compat``. +need to be formatted again using ``git format-patch``. The contents of a backport should be equivalent to the changes made by the original patch; explain any variations from the original patch in the commit From patchwork Wed May 31 13:58:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1788379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Zz3gRnlz; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWW8Y4rTZz20QB for ; Wed, 31 May 2023 23:59:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A11DA6141E; Wed, 31 May 2023 13:59:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A11DA6141E Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Zz3gRnlz X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MEzWndqr_RYQ; Wed, 31 May 2023 13:59:03 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id D5308613D1; Wed, 31 May 2023 13:59:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D5308613D1 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BF549C0093; Wed, 31 May 2023 13:58:57 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id AB603C0037 for ; Wed, 31 May 2023 13:58:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6E9CB415E2 for ; Wed, 31 May 2023 13:58:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6E9CB415E2 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Zz3gRnlz X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ljtrTgFPqj5b for ; Wed, 31 May 2023 13:58:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D48E44090F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id D48E44090F for ; Wed, 31 May 2023 13:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685541527; 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=Ni3m2GVsGvf9RHbFYXko6ynxOyEOX68fU/TK9PK6hPs=; b=Zz3gRnlz4os8Zqq0Flrnj8gFQcDBH+8M668vLhrLKXC+X7Lnd5jZ43L8k6a4wNq9hoOlNp taH8R6iOeZ/RZ5k4yqtHIboRZtTYXm+xQJ1y0PeeLPps9QX/da0G/CUbwCooY0BG3k4Kh+ 1jUC/I9PGBMYTGY7ipQB0NAxhn0omGA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-241-cQ1UzeQNOCWuIrI7eMJmcQ-1; Wed, 31 May 2023 09:58:46 -0400 X-MC-Unique: cQ1UzeQNOCWuIrI7eMJmcQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0F656800888 for ; Wed, 31 May 2023 13:58:46 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A873540C6EC4 for ; Wed, 31 May 2023 13:58:45 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 31 May 2023 09:58:39 -0400 Message-Id: <20230531135839.2517727-10-mmichels@redhat.com> In-Reply-To: <20230531135839.2517727-1-mmichels@redhat.com> References: <20230531135839.2517727-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 9/9] backporting-patches: Add concrete policy for where backports go. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This is based on discussions that have happened both on the ovs-dev mailing list as well as public IRC developer meetings. Signed-off-by: Mark Michelson --- .../contributing/backporting-patches.rst | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/Documentation/internals/contributing/backporting-patches.rst b/Documentation/internals/contributing/backporting-patches.rst index d7e4522cf..a633fb7db 100644 --- a/Documentation/internals/contributing/backporting-patches.rst +++ b/Documentation/internals/contributing/backporting-patches.rst @@ -73,6 +73,88 @@ not a trivial cherry-pick, then the maintainer may opt to submit the backport for the older branch on the mailing list for further review. This should be done in the same manner as described above. +Supported Versions +~~~~~~~~~~~~~~~~~~ + +As documented in :doc:`release-process`, standard term support versions receive +regular releases for a year, and LTS versions receive regular releases for two +years, plus an additional year of critical and security fixes. + +To make things easy, maintainers should simply backport all bugfixes to the +previous four branches before main. This is guaranteed to get the fix into all +supported standard-support versions as well as the current LTS version. This +will mean that maintainers will backport bugfixes to branches representing +versions that are not currently supported. + +Critical and security fixes should be handled differently. Maintainers should +determine what is the oldest LTS version that currently is supported for +critical and security fixes. Maintainers should backport these fixes to all +branches between main and that LTS version. This will mean that maintainers +will backport critical and security fixes into branches representing versions +that are not currently supported. + +The reason for backporting fixes into unsupported versions is twofold: + +- Backporting bugfixes into unsupported versions likely makes it easier to + backport critical and security fixes into older versions when necessary. +- Backporting critical and security fixes into unsupported versions allows for + users that are not ready to upgrade to a supported version to continue using + the branch tip until they are ready to fully upgrade. + +Example ++++++++ + +Consider the following release timeline. + ++---------+----------+--------------+ +| Version | Date | Release Type | ++---------+----------+--------------+ +| 24.03 | Mar 2024 | LTS | ++---------+----------+--------------+ +| 24.09 | Sep 2024 | Standard | ++---------+----------+--------------+ +| 25.03 | Mar 2025 | Standard | ++---------+----------+--------------+ +| 25.09 | Sep 2025 | Standard | ++---------+----------+--------------+ +| 26.03 | Mar 2026 | LTS | ++---------+----------+--------------+ +| 26.09 | Sep 2026 | Standard | ++---------+----------+--------------+ + +In our hypothetical world it is October 2026, so the current status of each +release is: + ++---------+------------------------------+ +| Version | Support Status | ++---------+------------------------------+ +| 24.03 | Critical/Security fixes only | ++---------+------------------------------+ +| 24.09 | Unsupported since Sep 2025 | ++---------+------------------------------+ +| 25.03 | Unsupported since Mar 2026 | ++---------+------------------------------+ +| 25.09 | Unsupported since Sep 2026 | ++---------+------------------------------+ +| 26.03 | Supported | ++---------+------------------------------+ +| 26.09 | Supported | ++---------+------------------------------+ + +Let's say that a bug fix is committed to main. Our policy would be to backport +the fix to 26.09, 26.03, 25.09, and 25.03. The fix will eventually appear in +releases of 26.03 and 26.09. Even though the fix is in the development branches +for 25.03 and 25.09, the fix will never appear in a release. + +Now let's say that a security issue is committed to main. Our policy would be +to backport the fix to 24.03, 24.09, 25.03, 25.09, 26.03, and 26.09. 24.03 is +the oldest LTS version that still is receiving critical and security fixes, so +we backport the fix to all branches between main and that version. The security +fix will appear in releases of 24.03, 26.03, and 26.09. The security fix will +be present in the 24.09, 25.03, and 25.09 development branches, but will never +appear in a release. + + Submission ~~~~~~~~~~