From patchwork Mon Dec 12 09:34:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070856 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 008FFC04FDE for ; Mon, 12 Dec 2022 09:34:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459161.716817 (Exim 4.92) (envelope-from ) id 1p4fCS-0002bF-DZ; Mon, 12 Dec 2022 09:34:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459161.716817; Mon, 12 Dec 2022 09:34:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCS-0002aK-Ag; Mon, 12 Dec 2022 09:34:16 +0000 Received: by outflank-mailman (input) for mailman id 459161; Mon, 12 Dec 2022 09:34:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCR-0002Nf-2s for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCQ-0000mY-R3; Mon, 12 Dec 2022 09:34:14 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCQ-0000rv-IY; Mon, 12 Dec 2022 09:34:14 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=kP1xPro9Nujh4ZNXQMchwHc6f62Mvtw9tY6G8ps3cXc=; b=yToWceGtyBU/nSuxgAYrnrzQ8p rtX+pKRN/xGOHTjVD1NBX8gc5UX+XRgBGjc6NTWGP2QndV0y5+XNWGx6sMDt1wnBDpJ2PhXF/OTuS K4y15U2qqiyUN26v/wkZyfFtK4bWEcF/JMf6p/JPx81khbgs5Avmj73i7cI4KSEDK5Vw=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 1/8] docs/process: branching-checklist: Use consistent indentation Date: Mon, 12 Dec 2022 09:34:03 +0000 Message-Id: <20221212093410.36289-2-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall At the moment, branch-checklist.txt is using a mix of soft and hard tab. They are both meant to be represented using 8 characters. In Xen we tend to use 4-space softtab represented with 4 characters. So to avoid having to use a different editor configuration, switch all the indentation to 4-space softtab. Signed-off-by: Julien Grall Acked-by: George Dunlap --- docs/process/branching-checklist.txt | 102 +++++++++++++-------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index 0e83272caacb..9aac474734c1 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -2,78 +2,78 @@ v=4.1 ov=4.0 * make branch in qemu-iwj.git - git-branch $v-testing master + git-branch $v-testing master # make branches in xenbits.xen.org qemus - ssh xen@xenbits.xen.org - cd ~/git/qemu-xen.git - git branch staging-$v staging - git branch stable-$v master - cd ~/git/qemu-xen-traditional.git - git branch stable-$v master + ssh xen@xenbits.xen.org + cd ~/git/qemu-xen.git + git branch staging-$v staging + git branch stable-$v master + cd ~/git/qemu-xen-traditional.git + git branch stable-$v master # make branch in libvirt - ssh xen@xenbits.xen.org - cd ~/git/libvirt.git/ - git branch osstest/frozen/xen-$v-testing xen-tested-master + ssh xen@xenbits.xen.org + cd ~/git/libvirt.git/ + git branch osstest/frozen/xen-$v-testing xen-tested-master # make branches in xenbits.xen.org xen.git - ssh xen@xenbits.xen.org - cd ~/git/xen.git - git branch staging-$v staging - git branch stable-$v master + ssh xen@xenbits.xen.org + cd ~/git/xen.git + git branch staging-$v staging + git branch stable-$v master # update xendocs@xenbits docs generator to generate new stable branch # docs too. commit to git. * make 13:37 https://xenbits.xen.org/docs/4.2-testing/ is now live true #14:17 HOWTO: login to xenbits. become "xendocs" . cd cronjobs . edit # xenbits-docs-all.sh in the obvious way. git commit - ssh root@xenbits.xen.org - su - xendocs - cd cronjobs - ed xenbits-docs-all.sh - /for branch - s/$/ 4.6-testing - # ^ OR SIMILAR - w - q - git add -p - git commit -m "Branch for $v" + ssh root@xenbits.xen.org + su - xendocs + cd cronjobs + ed xenbits-docs-all.sh + /for branch + s/$/ 4.6-testing + # ^ OR SIMILAR + w + q + git add -p + git commit -m "Branch for $v" * make branches etc. in osstest - ssh osstest@osstest.test-lab - cd testing.git - OSSTEST_CONFIG=production-config ./mg-branch-setup xen-$v-testing bisect - OSSTEST_CONFIG=production-config ./mg-branch-setup qemu-upstream-$v-testing bisect + ssh osstest@osstest.test-lab + cd testing.git + OSSTEST_CONFIG=production-config ./mg-branch-setup xen-$v-testing bisect + OSSTEST_CONFIG=production-config ./mg-branch-setup qemu-upstream-$v-testing bisect # make branches etc. in Cambridge osstest - ssh osstest@osstest.xs.citrite.net - cd testing.git - OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup xen-$v-testing bisect - OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup qemu-upstream-$v-testing bisect + ssh osstest@osstest.xs.citrite.net + cd testing.git + OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup xen-$v-testing bisect + OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup qemu-upstream-$v-testing bisect * add branch to osstest - ie add both eg qemu-upstream-4.2-testing and xen-4.2-testing to BRANCHES in cr-for-branches + ie add both eg qemu-upstream-4.2-testing and xen-4.2-testing to BRANCHES in cr-for-branches * add to patchbot - on xenbits - cd ~/HG/patchbot/ + on xenbits + cd ~/HG/patchbot/ - cp xen--master.patchbot-reported-heads xen--stable-$v.patchbot-reported-heads - cp xen--staging.patchbot-reported-heads xen--staging-$v.patchbot-reported-heads - cp qemu-xen--master.patchbot-reported-heads qemu-xen--stable-$v.patchbot-reported-heads - cp qemu-xen--staging.patchbot-reported-heads qemu-xen--staging-$v.patchbot-reported-heads - cp qemu-xen-traditional--master.patchbot-reported-heads qemu-xen-traditional--stable-$v.patchbot-reported-heads + cp xen--master.patchbot-reported-heads xen--stable-$v.patchbot-reported-heads + cp xen--staging.patchbot-reported-heads xen--staging-$v.patchbot-reported-heads + cp qemu-xen--master.patchbot-reported-heads qemu-xen--stable-$v.patchbot-reported-heads + cp qemu-xen--staging.patchbot-reported-heads qemu-xen--staging-$v.patchbot-reported-heads + cp qemu-xen-traditional--master.patchbot-reported-heads qemu-xen-traditional--stable-$v.patchbot-reported-heads - #emacs versions - perl -i~ -pe 'next unless m/\b\Q'$ov'\E\b/; $x=$_; $x=~ s/\b\Q'$ov'\E\b/'$v'/g; print $x;' versions - git diff - git add versions - git commit -m "Branch for $v" + #emacs versions + perl -i~ -pe 'next unless m/\b\Q'$ov'\E\b/; $x=$_; $x=~ s/\b\Q'$ov'\E\b/'$v'/g; print $x;' versions + git diff + git add versions + git commit -m "Branch for $v" Ensure references to qemu trees in xen.git's Config.mk are updated. Check this with - grep unstable Config.mk + grep unstable Config.mk which should produce no output. Replace as necessary. (There may well be none.) @@ -86,9 +86,9 @@ including turning off debug. Set off a manual osstest run, since the osstest cr-for-branches change will take a while to take effect: - ssh osstest@osstest.test-lab - cd testing.git - screen -S $v - BRANCHES=xen-$v-testing ./cr-for-branches branches -w "./cr-daily-branch --real" + ssh osstest@osstest.test-lab + cd testing.git + screen -S $v + BRANCHES=xen-$v-testing ./cr-for-branches branches -w "./cr-daily-branch --real" Send message to committers and RM. Use previous mail as a template. From patchwork Mon Dec 12 09:34:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070858 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D81EC10F1E for ; Mon, 12 Dec 2022 09:34:38 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459162.716829 (Exim 4.92) (envelope-from ) id 1p4fCT-0002sE-Lr; Mon, 12 Dec 2022 09:34:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459162.716829; Mon, 12 Dec 2022 09:34:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCT-0002s7-IA; Mon, 12 Dec 2022 09:34:17 +0000 Received: by outflank-mailman (input) for mailman id 459162; Mon, 12 Dec 2022 09:34:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCS-0002gg-Jx for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCS-0000mq-5T; Mon, 12 Dec 2022 09:34:16 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCR-0000rv-U6; Mon, 12 Dec 2022 09:34:16 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=TXtU8//lurM2F5mb2loMu+I4ppYz4X9RYDlyKMl3UM4=; b=ORJPKPifvRkMq8d9gLIT3F7Pxz fjJFR3UkHLrbwamlPjl330Mp7n8aJQsq4b/xN8CyxO94N4cJ8QFXwmOC53nY8pcKt1KCuV12prXME 2hhVdCN/x4qqTdDAv8zqCPpBIQk8TM+WbCxa4ReMKLnfe0O1P0cGjAe1zXZsDZUrV3TY=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , ijackson@chiark.greenend.org.uk Subject: [PATCH 2/8] docs/process: branching-checklist: Remove reference to qemu-ijw.git Date: Mon, 12 Dec 2022 09:34:04 +0000 Message-Id: <20221212093410.36289-3-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall Per [1], qemu-iwj.git was a clone of QEMU traditional on Ian's computer for tagging QEMU trad. The next section will provide tag for the official tree. So remove the section about qemu-ijw.git. [1] 25482.10006.140155.984629@chiark.greenend.org.uk Signed-off-by: Julien Grall Cc: ijackson@chiark.greenend.org.uk Acked-by: George Dunlap Acked-by: Ian Jackson --- docs/process/branching-checklist.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index 9aac474734c1..b8101dd0e359 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -1,9 +1,6 @@ v=4.1 ov=4.0 -* make branch in qemu-iwj.git - git-branch $v-testing master - # make branches in xenbits.xen.org qemus ssh xen@xenbits.xen.org cd ~/git/qemu-xen.git From patchwork Mon Dec 12 09:34:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03FA2C4708D for ; Mon, 12 Dec 2022 09:34:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459163.716839 (Exim 4.92) (envelope-from ) id 1p4fCV-00038t-VD; Mon, 12 Dec 2022 09:34:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459163.716839; Mon, 12 Dec 2022 09:34:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCV-00038h-S4; Mon, 12 Dec 2022 09:34:19 +0000 Received: by outflank-mailman (input) for mailman id 459163; Mon, 12 Dec 2022 09:34:18 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCU-00035t-GW for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:18 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCT-0000n6-Dn; Mon, 12 Dec 2022 09:34:17 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCT-0000rv-6G; Mon, 12 Dec 2022 09:34:17 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=77lchHhwHcgImnrvL1V0yWzZRlmrrX3w/h3w2HMcLxw=; b=0DCaQv1+Epv9fygoRtsQSxoAcg x7CtuVwdpGkOYzZO0C3RMPn+Aet2Q8ORbZus7QYtDBOQ6B4SkQQLW2JfCcBKDYdX67yFNL2OjMxWu UFy5qYeCmztbQPE+EoM91yyhTCmoIJNwuDRePnjeSpwxkuk8PGAnI5jMIIQtq4hlgHvo=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 3/8] docs/process: branching-checklist: Remove reference to root Date: Mon, 12 Dec 2022 09:34:05 +0000 Message-Id: <20221212093410.36289-4-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall The steps to generate the documentation for the new branch requires to ssh as root and then su to run with the user xendocs. The release technician may not (and should not) have access to root. So update the step to directly ssh as xendocs. Signed-off-by: Julien Grall Acked-by: George Dunlap --- docs/process/branching-checklist.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index b8101dd0e359..a98f6559ab1a 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -25,8 +25,7 @@ ov=4.0 * make 13:37 https://xenbits.xen.org/docs/4.2-testing/ is now live true #14:17 HOWTO: login to xenbits. become "xendocs" . cd cronjobs . edit # xenbits-docs-all.sh in the obvious way. git commit - ssh root@xenbits.xen.org - su - xendocs + ssh xendocs@xenbits.xen.org cd cronjobs ed xenbits-docs-all.sh /for branch From patchwork Mon Dec 12 09:34:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070860 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8BB90C2D0CB for ; Mon, 12 Dec 2022 09:34:38 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459164.716846 (Exim 4.92) (envelope-from ) id 1p4fCW-0003Cb-AP; Mon, 12 Dec 2022 09:34:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459164.716846; Mon, 12 Dec 2022 09:34:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCW-0003Bu-4k; Mon, 12 Dec 2022 09:34:20 +0000 Received: by outflank-mailman (input) for mailman id 459164; Mon, 12 Dec 2022 09:34:18 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCU-00037u-SW for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:18 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCU-0000nJ-M3; Mon, 12 Dec 2022 09:34:18 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCU-0000rv-Ed; Mon, 12 Dec 2022 09:34:18 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=vNUJF6QyXHl8BfjlfL/Ywnys+XyjUZ6SAkslh1MkdS4=; b=vVwwV/EXAxhu0+gk9lZL9XxoE2 /VaZD1ccF+DBCRFutnrEdEe+z+V8G7jLQ6viiQC+aV5+6tJV3Pn9I98n4np8IYr6xTS1ZtA4Ep1dB a5ZUuVaiDROVvnovS2IjbPVev37c+8YaaysBERUnpUHNa5451JrVsu6wqoUZofOYkdSk=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 4/8] docs/process: branching-checklist: Clarify steps to add the branch in osstest Date: Mon, 12 Dec 2022 09:34:06 +0000 Message-Id: <20221212093410.36289-5-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall The steps to add the new branch in osstest doesn't mention the change should be committed. Update the steps to clarify that. Take the opportunity to switch to use $v instead hardcoded version. Signed-off-by: Julien Grall --- docs/process/branching-checklist.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index a98f6559ab1a..d1550385c96e 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -49,7 +49,9 @@ ov=4.0 OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup qemu-upstream-$v-testing bisect * add branch to osstest - ie add both eg qemu-upstream-4.2-testing and xen-4.2-testing to BRANCHES in cr-for-branches + Add both qemu-upstream-$v-testing and xen-$v-testing to BRANCHES in cr-for-branches + git add -p + git commit -m "cr-for-branches: Add Xen and QEMU $v branch" * add to patchbot on xenbits From patchwork Mon Dec 12 09:34:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070863 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 198CDC2D0CD for ; Mon, 12 Dec 2022 09:34:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459165.716862 (Exim 4.92) (envelope-from ) id 1p4fCX-0003eK-OJ; Mon, 12 Dec 2022 09:34:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459165.716862; Mon, 12 Dec 2022 09:34:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCX-0003dA-I9; Mon, 12 Dec 2022 09:34:21 +0000 Received: by outflank-mailman (input) for mailman id 459165; Mon, 12 Dec 2022 09:34:20 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCW-0003CV-5J for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:20 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCV-0000nm-UX; Mon, 12 Dec 2022 09:34:19 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCV-0000rv-N3; Mon, 12 Dec 2022 09:34:19 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Cl3ZwB9XtYS6ogy7SQmgRKK0ZidCfoFSJ0o+zkfxHVo=; b=PswlWnlgRcwnH5ezcvYnEXZftp JWdHjSeI7hQ4PERN6fkx+2hRR9tvxOCp9BNNZML0F2/+uqzYN1Vz23aL2gaDT/1zuBZfG37KWhcLs WbRUKD+DTEaWW9ylYxQ1VRGylIJ5f4Q8K6q3vbJiecDVhnJZOghTbMCmYDRJ/l6ruKo0=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 5/8] docs/process: branching-checklist: Reword the section about Config.mk Date: Mon, 12 Dec 2022 09:34:07 +0000 Message-Id: <20221212093410.36289-6-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall Since at least Xen 4.12, the revision for external trees don't contain the word "unstable". So explicitely list the *_REVISION variables that need to be updated as part of the branching process. Signed-off-by: Julien Grall --- docs/process/branching-checklist.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index d1550385c96e..7004f16e8311 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -69,11 +69,9 @@ ov=4.0 git add versions git commit -m "Branch for $v" -Ensure references to qemu trees in xen.git's Config.mk are updated. -Check this with - grep unstable Config.mk -which should produce no output. Replace as necessary. -(There may well be none.) +Ensure references to qemu trees and Mini-OS in xen.git's Config.mk are updated. +The variables are QEMU_UPSTREAM_REVISION, QEMU_TRADITIONAL_REVISION and +MINIOS_UPSTREAM_REVISION. Update newly diverging staging (unstable) according to release-technician-checklist.txt section re README etc. From patchwork Mon Dec 12 09:34:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070862 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D28FC3DA6E for ; Mon, 12 Dec 2022 09:34:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459166.716873 (Exim 4.92) (envelope-from ) id 1p4fCZ-0003yV-8K; Mon, 12 Dec 2022 09:34:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459166.716873; Mon, 12 Dec 2022 09:34:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCZ-0003yI-3l; Mon, 12 Dec 2022 09:34:23 +0000 Received: by outflank-mailman (input) for mailman id 459166; Mon, 12 Dec 2022 09:34:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCX-0003cE-Dn for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCX-0000o8-6a; Mon, 12 Dec 2022 09:34:21 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCW-0000rv-VV; Mon, 12 Dec 2022 09:34:21 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=s+r0ak95Oyabto+BT3ShctS2hTUt3mW96Cq2J4tzEj0=; b=H60Dc66q88ei40hlWMQKEDUhBV nf4zKtuSp54/esj9R+fQ4A5FVDtt6gYqKza5V4h9HIqoS6Z/bJgUZpWllnKQ6TybJRVFY7nsyVVFz 49C6ZQMp0uI/Nq2z2ewR6PGOsASVPJ0lwZbuKRpQUGd8b0Un+IvcSZHPfGqdgoQjFrqA=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 6/8] docs/process: branching-checklist: Remove section about the cambridge colo Date: Mon, 12 Dec 2022 09:34:08 +0000 Message-Id: <20221212093410.36289-7-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall The cambridge colo was internal to Citrix (now Cloud) and hasn't been used by the community for a while. So remove the section. Signed-off-by: Julien Grall Acked-by: George Dunlap --- docs/process/branching-checklist.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index 7004f16e8311..c63952886b50 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -42,12 +42,6 @@ ov=4.0 OSSTEST_CONFIG=production-config ./mg-branch-setup xen-$v-testing bisect OSSTEST_CONFIG=production-config ./mg-branch-setup qemu-upstream-$v-testing bisect -# make branches etc. in Cambridge osstest - ssh osstest@osstest.xs.citrite.net - cd testing.git - OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup xen-$v-testing bisect - OSSTEST_CONFIG=production-config-cambridge ./mg-branch-setup qemu-upstream-$v-testing bisect - * add branch to osstest Add both qemu-upstream-$v-testing and xen-$v-testing to BRANCHES in cr-for-branches git add -p From patchwork Mon Dec 12 09:34:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56C74C4167B for ; Mon, 12 Dec 2022 09:34:38 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459167.716884 (Exim 4.92) (envelope-from ) id 1p4fCa-0004GU-IS; Mon, 12 Dec 2022 09:34:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459167.716884; Mon, 12 Dec 2022 09:34:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCa-0004Ff-Ce; Mon, 12 Dec 2022 09:34:24 +0000 Received: by outflank-mailman (input) for mailman id 459167; Mon, 12 Dec 2022 09:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCY-0003tm-KU for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCY-0000oW-Ex; Mon, 12 Dec 2022 09:34:22 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCY-0000rv-7h; Mon, 12 Dec 2022 09:34:22 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Or7ZWEnr7wyYNrxuahpihixmx7ZXU2xnjY4e99wUaXU=; b=mFbi9eRX2q7G0iEz1UuzoxcgLH Ewmk1zK/oJUEiMOfQMafqiXOn2Tscex+zs5uTPCqAvOs0oPNHFrilVrx+iBzTF0uxhXE0rP0t3U5X jrPWV/GBdJ67kfpYPTaFDr8BaqYaLP3od4CRN84gHlf92+ZcRb4e92xt8qNyMjtk/XGg=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 7/8] docs/proces: branching-checklist: Update the section "add to patchbot" Date: Mon, 12 Dec 2022 09:34:09 +0000 Message-Id: <20221212093410.36289-8-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall Make clear the patchbot is accessible from the user "xen" on xenbits. Signed-off-by: Julien Grall Acked-by: George Dunlap --- docs/process/branching-checklist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index c63952886b50..9f385f137386 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -48,7 +48,7 @@ ov=4.0 git commit -m "cr-for-branches: Add Xen and QEMU $v branch" * add to patchbot - on xenbits + ssh xen@xenbits.xen.org cd ~/HG/patchbot/ cp xen--master.patchbot-reported-heads xen--stable-$v.patchbot-reported-heads From patchwork Mon Dec 12 09:34:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 13070855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD157C4332F for ; Mon, 12 Dec 2022 09:34:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.459168.716889 (Exim 4.92) (envelope-from ) id 1p4fCb-0004Kt-0T; Mon, 12 Dec 2022 09:34:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 459168.716889; Mon, 12 Dec 2022 09:34:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCa-0004JU-PU; Mon, 12 Dec 2022 09:34:24 +0000 Received: by outflank-mailman (input) for mailman id 459168; Mon, 12 Dec 2022 09:34:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCZ-0004BO-VQ for xen-devel@lists.xenproject.org; Mon, 12 Dec 2022 09:34:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4fCZ-0000om-Nr; Mon, 12 Dec 2022 09:34:23 +0000 Received: from 54-240-197-232.amazon.com ([54.240.197.232] helo=dev-dsk-jgrall-1b-035652ec.eu-west-1.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1p4fCZ-0000rv-G6; Mon, 12 Dec 2022 09:34:23 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=pSl7LQSyjMeFHx4mklTwYzQi38y7YYr8at610vl4uCk=; b=aQT7Nxtj3zIaKWxFbJgbl2bMl8 iR1eOfCzkJCPA/EpIbUQHSjTpOXV0pW7K/xOk+i4xCvB2mOWJGUpzFTuqukHrjfR3KQU3gPgoS++X iPdbjYN2/1j26Ol1Fk8+tCctIh/LyW3bJ172Evv3MCm4zyfS/p3k9F8stxBZAvIyghXA=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: Henry.Wang@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 8/8] docs/process: branching-checklist: Add a list of accounts at the beginning Date: Mon, 12 Dec 2022 09:34:10 +0000 Message-Id: <20221212093410.36289-9-julien@xen.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212093410.36289-1-julien@xen.org> References: <20221212093410.36289-1-julien@xen.org> MIME-Version: 1.0 From: Julien Grall The checklist requires to have access to several accounts on both xenbits and osstest. List those accounts at the beginning of the file so it is easier to check if one has the permissions before starting the branching process. Signed-off-by: Julien Grall --- docs/process/branching-checklist.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index 9f385f137386..798e78a3fefe 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -1,3 +1,11 @@ +=== Before starting === + +Access to the following accounts is necessary: + * xenbits.xen.org: xen, xendocs + * osstest.osstest-test-lab: osstest + +=== Check list === + v=4.1 ov=4.0