From patchwork Wed Jul 27 14:27:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1661268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=a+VswfLd; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LtGN14cg4z9sFk for ; Thu, 28 Jul 2022 00:28:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 55D7C82640; Wed, 27 Jul 2022 14:27:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 55D7C82640 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=a+VswfLd 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 ua-pDkO6vQbS; Wed, 27 Jul 2022 14:27:58 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5FF3182425; Wed, 27 Jul 2022 14:27:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5FF3182425 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1C0F0C0071; Wed, 27 Jul 2022 14:27: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 7B71BC002D for ; Wed, 27 Jul 2022 14:27:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4765540A06 for ; Wed, 27 Jul 2022 14:27:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4765540A06 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=a+VswfLd 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 5xxH_5dWsxpj for ; Wed, 27 Jul 2022 14:27:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 000F34098D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 000F34098D for ; Wed, 27 Jul 2022 14:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658932070; 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; bh=H8EMFLYlI4dQFHktp6rhH4ZlXQwcI+Wo5faVnReDad0=; b=a+VswfLdWD8sPmr9bUGyOKposJ1Wti2aSjBBCXfLCggdU8OcDnv7/9vBKM6zQX48PZ6YnG 8A1YIPoxitWk0mWCMIPg7qvJ+aCU2Sp9v/EXIuU6N84WX+Vhm7nujxpYCbK5AvuDUCeUZb e03odgfFKbscRmx5+oSQf17Qcd0eGyo= 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-582-cGrcfATpMT-DrYcOH2JsnQ-1; Wed, 27 Jul 2022 10:27:48 -0400 X-MC-Unique: cGrcfATpMT-DrYcOH2JsnQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 587F3803FFA for ; Wed, 27 Jul 2022 14:27:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-0-21.rdu2.redhat.com [10.22.0.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF84290A04 for ; Wed, 27 Jul 2022 14:27:47 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 27 Jul 2022 10:27:45 -0400 Message-Id: <20220727142746.933436-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mmichels@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 1/2] release-process: 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" The document makes reference to the "master" branch throughout, but it has been renamed "main" for some time now. Signed-off-by: Mark Michelson Acked-by: Numan Siddique --- Documentation/internals/release-process.rst | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index 9db6e7494..e423c55d4 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -34,33 +34,33 @@ contributors, obtained through public discussion on, e.g., ovs-dev or the Release Strategy ---------------- -OVN feature development takes place on the "master" branch. Ordinarily, new -features are rebased against master and applied directly. For features that +OVN feature development takes place on the "main" branch. Ordinarily, new +features are rebased against main and applied directly. For features that take significant development, sometimes it is more appropriate to merge a -separate branch into master; please discuss this on ovs-dev in advance. +separate branch into main; please discuss this on ovs-dev in advance. The process of making a release has the following stages. See `Release Scheduling`_ for the timing of each stage: -1. "Soft freeze" of the master branch. +1. "Soft freeze" of the main branch. During the freeze, we ask committers to refrain from applying patches that add new features unless those patches were already being publicly discussed and reviewed before the freeze began. Bug fixes are welcome at any time. Please propose and discuss exceptions on ovs-dev. -2. Fork a release branch from master, named for the expected release number, +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. Release branches are intended for testing and stabilization. At this stage and in later stages, they should receive only bug fixes, not new features. Bug fixes applied to release branches should be backports of corresponding - bug fixes to the master branch, except for bugs present only on release + bug fixes to the main branch, except for bugs present only on release branches (which are rare in practice). At this stage, sometimes there can be exceptions to the rule that a release branch receives only bug fixes. Like bug fixes, new features on release - branches should be backports of the corresponding commits on the master + branches should be backports of the corresponding commits on the main branch. Features to be added to release branches should be limited in scope and risk and discussed on ovs-dev before creating the branch. @@ -97,10 +97,10 @@ one year of critical bug fixes and security fixes. Release Numbering ----------------- -The version number on master should normally end in .90. This indicates that +The version number on main should normally end in .90. This indicates that the OVN version is "almost" the next version to branch. -Forking master into branch-x.y requires two commits to master. The first is +Forking main into branch-x.y requires two commits to main. The first is titled "Prepare for x.y.0" and increments the version number to x.y. This is the initial commit on branch-x.y. The second is titled "Prepare for post-x.y.0 (x.y.90)" and increments the version number to x.y.90. @@ -124,9 +124,9 @@ approximate: +---------------+---------------------+--------------------------------------+ | T | Dec 1, Mar 1, ... | Begin x.y release cycle | +---------------+---------------------+--------------------------------------+ -| T + 2 | Feb 1, May 1, ... | "Soft freeze" master for x.y release | +| T + 2 | Feb 1, May 1, ... | "Soft freeze" main for x.y release | +---------------+---------------------+--------------------------------------+ -| T + 2.5 | Feb 15, May 15, ... | Fork branch-x.y from master | +| T + 2.5 | Feb 15, May 15, ... | Fork branch-x.y from main | +---------------+---------------------+--------------------------------------+ | T + 3 | Mar 1, Jun 1, ... | Release version x.y.0 | +---------------+---------------------+--------------------------------------+ From patchwork Wed Jul 27 14:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1661267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Y9gpOAcw; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LtGMy2y6nz9sFk for ; Thu, 28 Jul 2022 00:27:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DC9B360D9D; Wed, 27 Jul 2022 14:27:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DC9B360D9D 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=Y9gpOAcw 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 y3ffNoAngAD7; Wed, 27 Jul 2022 14:27:55 +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 EB10D60D6A; Wed, 27 Jul 2022 14:27:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org EB10D60D6A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C0278C0033; Wed, 27 Jul 2022 14:27:53 +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 D1F9CC002D for ; Wed, 27 Jul 2022 14:27:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9E06181B7B for ; Wed, 27 Jul 2022 14:27:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9E06181B7B 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=Y9gpOAcw 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 QRhXa57OdnJb for ; Wed, 27 Jul 2022 14:27:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E05078194C 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 E05078194C for ; Wed, 27 Jul 2022 14:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658932070; 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=175sKOo9NA9UCDZ9RSBU6TvSmS4a3VXUPHCxKl2i3Kk=; b=Y9gpOAcwG76uuZMQ4hpOJEmVoywTsydvy9Q5RjwMnJZq72fPtXsI6Y5TxLABlPyi5d0V/G Q4GVFcorJGFsP1lyhLcyRk1JdsbVibGNOWOOFo4eLuBJyrbMU8fVkvWcqNEK/y5grQbK6e nKQR6AYhnT3fAmtBfC0eCDivzrkrFFI= 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-592-uR-VKCkpNPansL-GzelwOw-1; Wed, 27 Jul 2022 10:27:49 -0400 X-MC-Unique: uR-VKCkpNPansL-GzelwOw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D270F1C06EDA for ; Wed, 27 Jul 2022 14:27:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-0-21.rdu2.redhat.com [10.22.0.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8ABAC90A04 for ; Wed, 27 Jul 2022 14:27:48 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Wed, 27 Jul 2022 10:27:46 -0400 Message-Id: <20220727142746.933436-2-mmichels@redhat.com> In-Reply-To: <20220727142746.933436-1-mmichels@redhat.com> References: <20220727142746.933436-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mmichels@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 2/2] release-process: Add 2023 calendar. 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 also removes the 2021 calendar since that has come and gone. Signed-off-by: Mark Michelson Acked-by: Numan Siddique --- Documentation/internals/release-process.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/internals/release-process.rst b/Documentation/internals/release-process.rst index e423c55d4..628ae9e8f 100644 --- a/Documentation/internals/release-process.rst +++ b/Documentation/internals/release-process.rst @@ -134,34 +134,34 @@ approximate: Release Calendar ---------------- -The 2021 timetable is shown below. Note that these dates are not set in stone. +The 2022 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. +---------+-------------+-----------------+---------+ | Release | Soft Freeze | Branch Creation | Release | +---------+-------------+-----------------+---------+ -| 21.03.0 | Feb 5 | Feb 19 | Mar 5 | +| 22.03.0 | Feb 4 | Feb 18 | Mar 4 | +---------+-------------+-----------------+---------+ -| 21.06.0 | May 7 | May 21 | Jun 4 | +| 22.06.0 | May 6 | May 20 | Jun 3 | +---------+-------------+-----------------+---------+ -| 21.09.0 | Aug 6 | Aug 20 | Sep 3 | +| 22.09.0 | Aug 5 | Aug 19 | Sep 2 | +---------+-------------+-----------------+---------+ -| 21.12.0 | Nov 5 | Nov 19 | Dec 3 | +| 22.12.0 | Nov 4 | Nov 18 | Dec 2 | +---------+-------------+-----------------+---------+ -Below is the 2022 timetable +Below is the 2023 timetable +---------+-------------+-----------------+---------+ | Release | Soft Freeze | Branch Creation | Release | +---------+-------------+-----------------+---------+ -| 22.03.0 | Feb 4 | Feb 18 | Mar 4 | +| 23.03.0 | Feb 3 | Feb 17 | Mar 3 | +---------+-------------+-----------------+---------+ -| 22.06.0 | May 6 | May 20 | Jun 3 | +| 23.06.0 | May 5 | May 19 | Jun 2 | +---------+-------------+-----------------+---------+ -| 22.09.0 | Aug 5 | Aug 19 | Sep 2 | +| 23.09.0 | Aug 4 | Aug 18 | Sep 1 | +---------+-------------+-----------------+---------+ -| 22.12.0 | Nov 4 | Nov 18 | Dec 2 | +| 23.12.0 | Nov 3 | Nov 17 | Dec 1 | +---------+-------------+-----------------+---------+ Contact