[PATCH 0/8] docs/process: branching-checklist: Update it

[PATCH 0/8] docs/process: branching-checklist: Update it

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

Hi all,

This is a collection of improvement for the branching checklist.

Cheers,

Julien Grall (8):
  docs/process: branching-checklist: Use consistent indentation
  docs/process: branching-checklist: Remove reference to qemu-ijw.git
  docs/process: branching-checklist: Remove reference to root
  docs/process: branching-checklist: Clarify steps to add the branch in
    osstest
  docs/process: branching-checklist: Reword the section about Config.mk
  docs/process: branching-checklist: Remove section about the cambridge
    colo
  docs/proces: branching-checklist: Update the section "add to patchbot"
  docs/process: branching-checklist: Add a list of accounts at the
    beginning

 docs/process/branching-checklist.txt | 122 +++++++++++++--------------
 1 file changed, 60 insertions(+), 62 deletions(-)

-- 
2.38.1

[PATCH 1/8] docs/process: branching-checklist: Use consistent indentation

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

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 <jgrall@amazon.com>
---
 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 <ijc> https://xenbits.xen.org/docs/4.2-testing/ is now live true
 #14:17 <ijc> 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.
-- 
2.38.1

[PATCH 2/8] docs/process: branching-checklist: Remove reference to qemu-ijw.git

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

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 <jgrall@amazon.com>
Cc: ijackson@chiark.greenend.org.uk
---
 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
-- 
2.38.1

[PATCH 3/8] docs/process: branching-checklist: Remove reference to root

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

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 <jgrall@amazon.com>
---
 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 <ijc> https://xenbits.xen.org/docs/4.2-testing/ is now live true
 #14:17 <ijc> 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
-- 
2.38.1

[PATCH 4/8] docs/process: branching-checklist: Clarify steps to add the branch in osstest

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

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 <jgrall@amazon.com>
---
 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
-- 
2.38.1

[PATCH 5/8] docs/process: branching-checklist: Reword the section about Config.mk

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

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 <jgrall@amazon.com>
---
 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.
-- 
2.38.1

[PATCH 6/8] docs/process: branching-checklist: Remove section about the cambridge colo

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

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 <jgrall@amazon.com>
---
 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
-- 
2.38.1

[PATCH 7/8] docs/proces: branching-checklist: Update the section "add to patchbot"

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

Make clear the patchbot is accessible from the user "xen" on xenbits.

Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 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
-- 
2.38.1

[PATCH 8/8] docs/process: branching-checklist: Add a list of accounts at the beginning

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

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 <jgrall@amazon.com>
---
 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
 
-- 
2.38.1

RE: [PATCH 0/8] docs/process: branching-checklist: Update it

[Henry Wang]

Hi Julien,

> -----Original Message-----
> From: Julien Grall <julien@xen.org>
> Subject: [PATCH 0/8] docs/process: branching-checklist: Update it
> 
> From: Julien Grall <jgrall@amazon.com>
> 
> Hi all,
> 
> This is a collection of improvement for the branching checklist.

Thanks for this work! Since from the docs/process/RUBRIC we are having:
```
They are living documents, and no special approval is needed to modify
them beyond the usual acks for commit.  They should be updated as and
when it seems expediant.
```

I don't know if my reviewed-by counts but I did go through the whole
series, so for the whole series:

Reviewed-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry

> 
> Cheers,
> 
> Julien Grall (8):
>   docs/process: branching-checklist: Use consistent indentation
>   docs/process: branching-checklist: Remove reference to qemu-ijw.git
>   docs/process: branching-checklist: Remove reference to root
>   docs/process: branching-checklist: Clarify steps to add the branch in
>     osstest
>   docs/process: branching-checklist: Reword the section about Config.mk
>   docs/process: branching-checklist: Remove section about the cambridge
>     colo
>   docs/proces: branching-checklist: Update the section "add to patchbot"
>   docs/process: branching-checklist: Add a list of accounts at the
>     beginning
> 
>  docs/process/branching-checklist.txt | 122 +++++++++++++--------------
>  1 file changed, 60 insertions(+), 62 deletions(-)
> 
> --
> 2.38.1

Re: [PATCH 0/8] docs/process: branching-checklist: Update it

[Jan Beulich]

On 12.12.2022 10:49, Henry Wang wrote:
>> -----Original Message-----
>> From: Julien Grall <julien@xen.org>
>> Subject: [PATCH 0/8] docs/process: branching-checklist: Update it
>>
>> From: Julien Grall <jgrall@amazon.com>
>>
>> This is a collection of improvement for the branching checklist.
> 
> Thanks for this work! Since from the docs/process/RUBRIC we are having:
> ```
> They are living documents, and no special approval is needed to modify
> them beyond the usual acks for commit.  They should be updated as and
> when it seems expediant.
> ```
> 
> I don't know if my reviewed-by counts but I did go through the whole
> series, so for the whole series:
> 
> Reviewed-by: Henry Wang <Henry.Wang@arm.com>

Why should it not count? Thanks for taking the time to look through
this series.

>> Julien Grall (8):
>>   docs/process: branching-checklist: Use consistent indentation
>>   docs/process: branching-checklist: Remove reference to qemu-ijw.git
>>   docs/process: branching-checklist: Remove reference to root
>>   docs/process: branching-checklist: Clarify steps to add the branch in
>>     osstest
>>   docs/process: branching-checklist: Reword the section about Config.mk
>>   docs/process: branching-checklist: Remove section about the cambridge
>>     colo
>>   docs/proces: branching-checklist: Update the section "add to patchbot"

Just one nit here: The subject prefix could do with adding the missing 's'.

Jan

>>   docs/process: branching-checklist: Add a list of accounts at the
>>     beginning
>>
>>  docs/process/branching-checklist.txt | 122 +++++++++++++--------------
>>  1 file changed, 60 insertions(+), 62 deletions(-)

Re: [PATCH 1/8] docs/process: branching-checklist: Use consistent indentation

[George Dunlap]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

On Mon, Dec 12, 2022 at 9:34 AM Julien Grall <julien@xen.org> wrote:

> From: Julien Grall <jgrall@amazon.com>
>
> 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 <jgrall@amazon.com>
>

Acked-by: George Dunlap <george.dunlap@cloud.com>

[-- Attachment #2: Type: text/html, Size: 1062 bytes --]

Re: [PATCH 2/8] docs/process: branching-checklist: Remove reference to qemu-ijw.git

[George Dunlap]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

On Mon, Dec 12, 2022 at 9:34 AM Julien Grall <julien@xen.org> wrote:

> From: Julien Grall <jgrall@amazon.com>
>
> 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 <jgrall@amazon.com>
>

Acked-by: George Dunlap <george.dunlap@cloud.com>

[-- Attachment #2: Type: text/html, Size: 1100 bytes --]

Re: [PATCH 3/8] docs/process: branching-checklist: Remove reference to root

[George Dunlap]

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

On Mon, Dec 12, 2022 at 9:34 AM Julien Grall <julien@xen.org> wrote:

> From: Julien Grall <jgrall@amazon.com>
>
> 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 <jgrall@amazon.com>
>

Acked-by: George Dunlap <george.dunlap@cloud.com>

[-- Attachment #2: Type: text/html, Size: 1008 bytes --]

Re: [PATCH 5/8] docs/process: branching-checklist: Reword the section about Config.mk

[George Dunlap]

[-- Attachment #1: Type: text/plain, Size: 1504 bytes --]

On Mon, Dec 12, 2022 at 9:34 AM Julien Grall <julien@xen.org> wrote:

> From: Julien Grall <jgrall@amazon.com>
>
> 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 <jgrall@amazon.com>
> ---
>  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.
>

One advantage of the previous wording was that it helped you know what the
references *weren't* supposed to look like (although it might have been
more helpful to know what the references *were* supposed to look like).
Would it make sense to add a few words about what they're supposed to look
like?

 -George

[-- Attachment #2: Type: text/html, Size: 2106 bytes --]

Re: [PATCH 6/8] docs/process: branching-checklist: Remove section about the cambridge colo

[George Dunlap]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

On Mon, Dec 12, 2022 at 9:34 AM Julien Grall <julien@xen.org> wrote:

> From: Julien Grall <jgrall@amazon.com>
>
> 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 <jgrall@amazon.com>
>

Acked-by: George Dunlap <george.dunlap@cloud.com>

[-- Attachment #2: Type: text/html, Size: 894 bytes --]

Re: [PATCH 7/8] docs/proces: branching-checklist: Update the section "add to patchbot"

[George Dunlap]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

On Mon, Dec 12, 2022 at 9:34 AM Julien Grall <julien@xen.org> wrote:

> From: Julien Grall <jgrall@amazon.com>
>
> Make clear the patchbot is accessible from the user "xen" on xenbits.
>
> Signed-off-by: Julien Grall <jgrall@amazon.com>
>

Acked-by: George Dunlap <george.dunlap@citrix.com>

[-- Attachment #2: Type: text/html, Size: 828 bytes --]

Re: [PATCH 2/8] docs/process: branching-checklist: Remove reference to qemu-ijw.git

[Ian Jackson]

Julien Grall writes ("[PATCH 2/8] docs/process: branching-checklist: Remove reference to qemu-ijw.git"):
> From: Julien Grall <jgrall@amazon.com>
> 
> 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 <jgrall@amazon.com>
> Cc: ijackson@chiark.greenend.org.uk

Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Ian.

Re: [PATCH 5/8] docs/process: branching-checklist: Reword the section about Config.mk

[Julien Grall]

Hi George,

Sorry for the late answer.

On 12/12/2022 12:33, George Dunlap wrote:
> On Mon, Dec 12, 2022 at 9:34 AM Julien Grall <julien@xen.org> wrote:
> 
>> From: Julien Grall <jgrall@amazon.com>
>>
>> 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 <jgrall@amazon.com>
>> ---
>>   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.
>>
> 
> One advantage of the previous wording was that it helped you know what the
> references *weren't* supposed to look like (although it might have been
> more helpful to know what the references *were* supposed to look like).
> Would it make sense to add a few words about what they're supposed to look
> like?

Good point. I will replace the last sentences to:

The variables and there content should be:
   - QEMU_UPSTREAM_REVISION: qemu-xen-X.Y.0
   - QEMU_TRADITIONAL_REVISION: xen-X.Y.0
   - MINIOS_UPSTREAM_REVISION: xen-RELEASE-X.Y.0

Where X.Y is the release version (e.g. 4.17).

Cheers,

-- 
Julien Grall

Re: [PATCH 0/8] docs/process: branching-checklist: Update it

[Julien Grall]

On 12/12/2022 09:49, Henry Wang wrote:
> Hi Julien,

Hi Henry,

Sorry for the late reply.

>> -----Original Message-----
>> From: Julien Grall <julien@xen.org>
>> Subject: [PATCH 0/8] docs/process: branching-checklist: Update it
>>
>> From: Julien Grall <jgrall@amazon.com>
>>
>> Hi all,
>>
>> This is a collection of improvement for the branching checklist.
> 
> Thanks for this work! Since from the docs/process/RUBRIC we are having:
> ```
> They are living documents, and no special approval is needed to modify
> them beyond the usual acks for commit.  They should be updated as and
> when it seems expediant.
> ```
> 
> I don't know if my reviewed-by counts but I did go through the whole
> series, so for the whole series:
> 
> Reviewed-by: Henry Wang <Henry.Wang@arm.com>

All reviews count :). Thanks for looking through them. I have added your 
tag to all but one which needs a respin.

> 
> Kind regards,
> Henry
> 
>>
>> Cheers,
>>
>> Julien Grall (8):
>>    docs/process: branching-checklist: Use consistent indentation
>>    docs/process: branching-checklist: Remove reference to qemu-ijw.git
>>    docs/process: branching-checklist: Remove reference to root
>>    docs/process: branching-checklist: Clarify steps to add the branch in
>>      osstest

I have committed up to this patch.

>>    docs/process: branching-checklist: Reword the section about Config.mk
>>    docs/process: branching-checklist: Remove section about the cambridge
>>      colo
>>    docs/proces: branching-checklist: Update the section "add to patchbot"
>>    docs/process: branching-checklist: Add a list of accounts at the
>>      beginning
>>
>>   docs/process/branching-checklist.txt | 122 +++++++++++++--------------
>>   1 file changed, 60 insertions(+), 62 deletions(-)
>>
>> --
>> 2.38.1
> 

Cheers,

-- 
Julien Grall