[PATCH] Config: use Mini-OS master for xen-unstable

[PATCH] Config: use Mini-OS master for xen-unstable

[Juergen Gross]

In order to get Mini-OS master branch tested by OSStest, use it for
xen-unstable.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
There are some Mini-OS patches pending, of which at least the Mini-OS
netfront fix should be committed as it will be required for qemu-stubdom
to work.
---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 4d723eec1d..d4e8ced104 100644
--- a/Config.mk
+++ b/Config.mk
@@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
 QEMU_UPSTREAM_REVISION ?= master
-MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
+MINIOS_UPSTREAM_REVISION ?= master
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0
 
-- 
2.26.2

Re: [PATCH] Config: use Mini-OS master for xen-unstable

[Jan Beulich]

On 31.08.2021 09:30, Juergen Gross wrote:
> In order to get Mini-OS master branch tested by OSStest, use it for
> xen-unstable.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>
> ---
> There are some Mini-OS patches pending, of which at least the Mini-OS
> netfront fix should be committed as it will be required for qemu-stubdom
> to work.
> ---
>  Config.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Config.mk b/Config.mk
> index 4d723eec1d..d4e8ced104 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
>  endif
>  OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
>  QEMU_UPSTREAM_REVISION ?= master
> -MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
> +MINIOS_UPSTREAM_REVISION ?= master

I'm afraid this, effectively reverting 82c3d15c903a ("minios: Revert recent
change and revert to working minios"), would set us up for the same problem
again that was dealt with there. IOW you're re-proposing a change of yours
(e013e8514389 ["config: use mini-os master for unstable"]) which was
subsequently reverted, without spelling out what has since changed.

Jan

Re: [PATCH] Config: use Mini-OS master for xen-unstable

[Juergen Gross]

[-- Attachment #1.1.1: Type: text/plain, Size: 1651 bytes --]

On 01.09.21 10:59, Jan Beulich wrote:
> On 31.08.2021 09:30, Juergen Gross wrote:
>> In order to get Mini-OS master branch tested by OSStest, use it for
>> xen-unstable.
>>
>> Signed-off-by: Juergen Gross <jgross@suse.com>
>> ---
>> There are some Mini-OS patches pending, of which at least the Mini-OS
>> netfront fix should be committed as it will be required for qemu-stubdom
>> to work.
>> ---
>>   Config.mk | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Config.mk b/Config.mk
>> index 4d723eec1d..d4e8ced104 100644
>> --- a/Config.mk
>> +++ b/Config.mk
>> @@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
>>   endif
>>   OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
>>   QEMU_UPSTREAM_REVISION ?= master
>> -MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
>> +MINIOS_UPSTREAM_REVISION ?= master
> 
> I'm afraid this, effectively reverting 82c3d15c903a ("minios: Revert recent
> change and revert to working minios"), would set us up for the same problem
> again that was dealt with there. IOW you're re-proposing a change of yours
> (e013e8514389 ["config: use mini-os master for unstable"]) which was
> subsequently reverted, without spelling out what has since changed.

How do you suggest to proceed then?

Will every Mini-OS commit require to be followed by a Xen commit then,
which will either result in a test success, or in a revert of that Xen
commit?

It should be noted that the presumed interface change in Mini-OS causing
the failure in OSStest last year has been reverted by me.


Juergen

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3135 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

Re: [PATCH] Config: use Mini-OS master for xen-unstable

[Jan Beulich]

On 01.09.2021 11:53, Juergen Gross wrote:
> On 01.09.21 10:59, Jan Beulich wrote:
>> On 31.08.2021 09:30, Juergen Gross wrote:
>>> In order to get Mini-OS master branch tested by OSStest, use it for
>>> xen-unstable.
>>>
>>> Signed-off-by: Juergen Gross <jgross@suse.com>
>>> ---
>>> There are some Mini-OS patches pending, of which at least the Mini-OS
>>> netfront fix should be committed as it will be required for qemu-stubdom
>>> to work.
>>> ---
>>>   Config.mk | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Config.mk b/Config.mk
>>> index 4d723eec1d..d4e8ced104 100644
>>> --- a/Config.mk
>>> +++ b/Config.mk
>>> @@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
>>>   endif
>>>   OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
>>>   QEMU_UPSTREAM_REVISION ?= master
>>> -MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
>>> +MINIOS_UPSTREAM_REVISION ?= master
>>
>> I'm afraid this, effectively reverting 82c3d15c903a ("minios: Revert recent
>> change and revert to working minios"), would set us up for the same problem
>> again that was dealt with there. IOW you're re-proposing a change of yours
>> (e013e8514389 ["config: use mini-os master for unstable"]) which was
>> subsequently reverted, without spelling out what has since changed.
> 
> How do you suggest to proceed then?
> 
> Will every Mini-OS commit require to be followed by a Xen commit then,
> which will either result in a test success, or in a revert of that Xen
> commit?

Once the two trees are assumed to be fully decoupled, and once a push
gate has been put in place for mini-os.git, we can do what you suggest.

Jan

Re: [PATCH] Config: use Mini-OS master for xen-unstable

[Ian Jackson]

Juergen Gross writes ("Re: [PATCH] Config: use Mini-OS master for xen-unstable"):
> How do you suggest to proceed then?
> 
> Will every Mini-OS commit require to be followed by a Xen commit then,
> which will either result in a test success, or in a revert of that Xen
> commit?

That is how the current arrangement works.  That's strict coupling.

If you want to decouple it, that's possible.  Ie, run a separate
osstest "branch" (ie, series of flights) for mini-os; have a separate
osstest-tested mini-os output branch, etc.

Wei, if we were to do that, should we have a "staging" and "main" for
mini-os in the main mini-os tree, or what ?

Ian.