[PATCH v2] tests/vm: update openbsd image to 7.6

[PATCH v2] tests/vm: update openbsd image to 7.6

[Brad Smith]

tests/vm: update openbsd image to 7.6

Remove tomli as Python has been updated to 3.11.

Signed-off-by: Brad Smith <brad@comstyle.com>
---
 tests/vm/openbsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 49cab08782..dfd11c93f0 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):
     name = "openbsd"
     arch = "x86_64"
 
-    link = "https://cdn.openbsd.org/pub/OpenBSD/7.5/amd64/install75.iso"
-    csum = "034435c6e27405d5a7fafb058162943c194eb793dafdc412c08d49bb56b3892a"
+    link = "https://cdn.openbsd.org/pub/OpenBSD/7.6/amd64/install76.iso"
+    csum = "60cba8cb391b50bba8fa10fc768bd0529636f5345d82133c93e22c798d8e5269"
     size = "20G"
     pkgs = [
         # tools
@@ -32,7 +32,6 @@ class OpenBSDVM(basevm.BaseVM):
         "pkgconf",
         "bzip2", "xz",
         "ninja",
-        "py3-tomli",
 
         # gnu tools
         "bash",
@@ -160,6 +159,7 @@ class OpenBSDVM(basevm.BaseVM):
 
         self.print_step("Installation started now, this will take a while")
         self.console_wait_send("Location of sets",        "done\n")
+        self.console_wait_send("Time appears wrong.  Set to", "\n")
 
         self.console_wait("successfully completed")
         self.print_step("Installation finished, rebooting")
-- 
2.46.1

Re: [PATCH v2] tests/vm: update openbsd image to 7.6

[Daniel P. Berrangé]

On Sun, Oct 13, 2024 at 02:19:41AM -0400, Brad Smith wrote:
> tests/vm: update openbsd image to 7.6
> 
> Remove tomli as Python has been updated to 3.11.
> 
> Signed-off-by: Brad Smith <brad@comstyle.com>
> ---
>  tests/vm/openbsd | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/vm/openbsd b/tests/vm/openbsd
> index 49cab08782..dfd11c93f0 100755
> --- a/tests/vm/openbsd
> +++ b/tests/vm/openbsd
> @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):
>      name = "openbsd"
>      arch = "x86_64"
>  
> -    link = "https://cdn.openbsd.org/pub/OpenBSD/7.5/amd64/install75.iso"
> -    csum = "034435c6e27405d5a7fafb058162943c194eb793dafdc412c08d49bb56b3892a"
> +    link = "https://cdn.openbsd.org/pub/OpenBSD/7.6/amd64/install76.iso"
> +    csum = "60cba8cb391b50bba8fa10fc768bd0529636f5345d82133c93e22c798d8e5269"
>      size = "20G"
>      pkgs = [
>          # tools
> @@ -32,7 +32,6 @@ class OpenBSDVM(basevm.BaseVM):
>          "pkgconf",
>          "bzip2", "xz",
>          "ninja",
> -        "py3-tomli",
>  
>          # gnu tools
>          "bash",
> @@ -160,6 +159,7 @@ class OpenBSDVM(basevm.BaseVM):
>  
>          self.print_step("Installation started now, this will take a while")
>          self.console_wait_send("Location of sets",        "done\n")
> +        self.console_wait_send("Time appears wrong.  Set to", "\n")

Have you any idea why this line has suddenly become neccessary ?

Without your patch, I'm seeing OpenBSD VM installs fail with the existing
'install75.iso' image, with the error matching this line

  con recv: Time appears wrong.  Set to 'Mon Oct 21 04:07:03 UTC 2024'? [yes]

The OpenBSD installer can't have changed behind our back, because we've
recorded the original ISO image checksum.

So I'm wondering what other thing has changed to suddenly make this
"Time appears wrong" message appear ?  Have we accidentally broken
something in QEMU ? 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v2] tests/vm: update openbsd image to 7.6

[Brad Smith]

On 2024-10-21 5:27 a.m., Daniel P. Berrangé wrote:
> On Sun, Oct 13, 2024 at 02:19:41AM -0400, Brad Smith wrote:
>> tests/vm: update openbsd image to 7.6
>>
>> Remove tomli as Python has been updated to 3.11.
>>
>> Signed-off-by: Brad Smith <brad@comstyle.com>
>> ---
>>   tests/vm/openbsd | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/vm/openbsd b/tests/vm/openbsd
>> index 49cab08782..dfd11c93f0 100755
>> --- a/tests/vm/openbsd
>> +++ b/tests/vm/openbsd
>> @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):
>>       name = "openbsd"
>>       arch = "x86_64"
>>   
>> -    link = "https://cdn.openbsd.org/pub/OpenBSD/7.5/amd64/install75.iso"
>> -    csum = "034435c6e27405d5a7fafb058162943c194eb793dafdc412c08d49bb56b3892a"
>> +    link = "https://cdn.openbsd.org/pub/OpenBSD/7.6/amd64/install76.iso"
>> +    csum = "60cba8cb391b50bba8fa10fc768bd0529636f5345d82133c93e22c798d8e5269"
>>       size = "20G"
>>       pkgs = [
>>           # tools
>> @@ -32,7 +32,6 @@ class OpenBSDVM(basevm.BaseVM):
>>           "pkgconf",
>>           "bzip2", "xz",
>>           "ninja",
>> -        "py3-tomli",
>>   
>>           # gnu tools
>>           "bash",
>> @@ -160,6 +159,7 @@ class OpenBSDVM(basevm.BaseVM):
>>   
>>           self.print_step("Installation started now, this will take a while")
>>           self.console_wait_send("Location of sets",        "done\n")
>> +        self.console_wait_send("Time appears wrong.  Set to", "\n")
> Have you any idea why this line has suddenly become neccessary ?
Thomas provided that piece.
> Without your patch, I'm seeing OpenBSD VM installs fail with the existing
> 'install75.iso' image, with the error matching this line
>
>    con recv: Time appears wrong.  Set to 'Mon Oct 21 04:07:03 UTC 2024'? [yes]
>
> The OpenBSD installer can't have changed behind our back, because we've
> recorded the original ISO image checksum.
>
> So I'm wondering what other thing has changed to suddenly make this
> "Time appears wrong" message appear ?  Have we accidentally broken
> something in QEMU ?
>
> With regards,
> Daniel


This is not new in the installer as far as I can see. But I have never 
seen this until now.

https://github.com/openbsd/src/blob/ad7ea506c1758b3b614d7becde019d9bf8d29459/distrib/miniroot/install.sub#L3315

     # If we got a timestamp from the cgi server, and that time diffs by 
more
     # than 120 seconds, ask if the user wants to adjust the time.
     if _time=$(http_time) && _now=$(date +%s) &&
         (( _now - _time > 120 || _time - _now > 120 )); then
         ln -sf /mnt/usr/share/zoneinfo/$TZ /etc/localtime
         if ask_yn "Time appears wrong.  Set to '$(date -r 
"$(http_time)")'?" yes; then
             date $(date -r "$(http_time)" "+%Y%m%d%H%M.%S") >/dev/null
             # N.B. This will screw up SECONDS.
         fi
         rm -f /etc/localtime
     fi

Re: [PATCH v2] tests/vm: update openbsd image to 7.6

[Thomas Huth]

On 21/10/2024 11.58, Brad Smith wrote:
> On 2024-10-21 5:27 a.m., Daniel P. Berrangé wrote:
>> On Sun, Oct 13, 2024 at 02:19:41AM -0400, Brad Smith wrote:
>>> tests/vm: update openbsd image to 7.6
>>>
>>> Remove tomli as Python has been updated to 3.11.
>>>
>>> Signed-off-by: Brad Smith <brad@comstyle.com>
>>> ---
>>>   tests/vm/openbsd | 6 +++---
>>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/tests/vm/openbsd b/tests/vm/openbsd
>>> index 49cab08782..dfd11c93f0 100755
>>> --- a/tests/vm/openbsd
>>> +++ b/tests/vm/openbsd
>>> @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):
>>>       name = "openbsd"
>>>       arch = "x86_64"
>>> -    link = "https://cdn.openbsd.org/pub/OpenBSD/7.5/amd64/install75.iso"
>>> -    csum = 
>>> "034435c6e27405d5a7fafb058162943c194eb793dafdc412c08d49bb56b3892a"
>>> +    link = "https://cdn.openbsd.org/pub/OpenBSD/7.6/amd64/install76.iso"
>>> +    csum = 
>>> "60cba8cb391b50bba8fa10fc768bd0529636f5345d82133c93e22c798d8e5269"
>>>       size = "20G"
>>>       pkgs = [
>>>           # tools
>>> @@ -32,7 +32,6 @@ class OpenBSDVM(basevm.BaseVM):
>>>           "pkgconf",
>>>           "bzip2", "xz",
>>>           "ninja",
>>> -        "py3-tomli",
>>>           # gnu tools
>>>           "bash",
>>> @@ -160,6 +159,7 @@ class OpenBSDVM(basevm.BaseVM):
>>>           self.print_step("Installation started now, this will take a 
>>> while")
>>>           self.console_wait_send("Location of sets",        "done\n")
>>> +        self.console_wait_send("Time appears wrong.  Set to", "\n")
>> Have you any idea why this line has suddenly become neccessary ?
> Thomas provided that piece.
>> Without your patch, I'm seeing OpenBSD VM installs fail with the existing
>> 'install75.iso' image, with the error matching this line
>>
>>    con recv: Time appears wrong.  Set to 'Mon Oct 21 04:07:03 UTC 2024'? 
>> [yes]
>>
>> The OpenBSD installer can't have changed behind our back, because we've
>> recorded the original ISO image checksum.
>>
>> So I'm wondering what other thing has changed to suddenly make this
>> "Time appears wrong" message appear ?  Have we accidentally broken
>> something in QEMU ?
>>
>> With regards,
>> Daniel
> 
> 
> This is not new in the installer as far as I can see. But I have never seen 
> this until now.
> 
> https://github.com/openbsd/src/blob/ 
> ad7ea506c1758b3b614d7becde019d9bf8d29459/distrib/miniroot/install.sub#L3315
> 
>      # If we got a timestamp from the cgi server, and that time diffs by more
>      # than 120 seconds, ask if the user wants to adjust the time.
>      if _time=$(http_time) && _now=$(date +%s) &&
>          (( _now - _time > 120 || _time - _now > 120 )); then
>          ln -sf /mnt/usr/share/zoneinfo/$TZ /etc/localtime
>          if ask_yn "Time appears wrong.  Set to '$(date -r 
> "$(http_time)")'?" yes; then
>              date $(date -r "$(http_time)" "+%Y%m%d%H%M.%S") >/dev/null
>              # N.B. This will screw up SECONDS.
>          fi
>          rm -f /etc/localtime
>      fi

I just tried some older versions of QEMU (where it used to work fine), but 
the error is still there. Is maybe the time of the server wrong?

  Thomas

Re: [PATCH v2] tests/vm: update openbsd image to 7.6

[Daniel P. Berrangé]

On Mon, Oct 21, 2024 at 12:49:27PM +0200, Thomas Huth wrote:
> On 21/10/2024 11.58, Brad Smith wrote:
> > On 2024-10-21 5:27 a.m., Daniel P. Berrangé wrote:
> > > On Sun, Oct 13, 2024 at 02:19:41AM -0400, Brad Smith wrote:
> > > > tests/vm: update openbsd image to 7.6
> > > > 
> > > > Remove tomli as Python has been updated to 3.11.
> > > > 
> > > > Signed-off-by: Brad Smith <brad@comstyle.com>
> > > > ---
> > > >   tests/vm/openbsd | 6 +++---
> > > >   1 file changed, 3 insertions(+), 3 deletions(-)
> > > > 
> > > > diff --git a/tests/vm/openbsd b/tests/vm/openbsd
> > > > index 49cab08782..dfd11c93f0 100755
> > > > --- a/tests/vm/openbsd
> > > > +++ b/tests/vm/openbsd
> > > > @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM):
> > > >       name = "openbsd"
> > > >       arch = "x86_64"
> > > > -    link = "https://cdn.openbsd.org/pub/OpenBSD/7.5/amd64/install75.iso"
> > > > -    csum =
> > > > "034435c6e27405d5a7fafb058162943c194eb793dafdc412c08d49bb56b3892a"
> > > > +    link = "https://cdn.openbsd.org/pub/OpenBSD/7.6/amd64/install76.iso"
> > > > +    csum =
> > > > "60cba8cb391b50bba8fa10fc768bd0529636f5345d82133c93e22c798d8e5269"
> > > >       size = "20G"
> > > >       pkgs = [
> > > >           # tools
> > > > @@ -32,7 +32,6 @@ class OpenBSDVM(basevm.BaseVM):
> > > >           "pkgconf",
> > > >           "bzip2", "xz",
> > > >           "ninja",
> > > > -        "py3-tomli",
> > > >           # gnu tools
> > > >           "bash",
> > > > @@ -160,6 +159,7 @@ class OpenBSDVM(basevm.BaseVM):
> > > >           self.print_step("Installation started now, this will
> > > > take a while")
> > > >           self.console_wait_send("Location of sets",        "done\n")
> > > > +        self.console_wait_send("Time appears wrong.  Set to", "\n")
> > > Have you any idea why this line has suddenly become neccessary ?
> > Thomas provided that piece.
> > > Without your patch, I'm seeing OpenBSD VM installs fail with the existing
> > > 'install75.iso' image, with the error matching this line
> > > 
> > >    con recv: Time appears wrong.  Set to 'Mon Oct 21 04:07:03 UTC
> > > 2024'? [yes]
> > > 
> > > The OpenBSD installer can't have changed behind our back, because we've
> > > recorded the original ISO image checksum.
> > > 
> > > So I'm wondering what other thing has changed to suddenly make this
> > > "Time appears wrong" message appear ?  Have we accidentally broken
> > > something in QEMU ?
> > > 
> > > With regards,
> > > Daniel
> > 
> > 
> > This is not new in the installer as far as I can see. But I have never
> > seen this until now.
> > 
> > https://github.com/openbsd/src/blob/
> > ad7ea506c1758b3b614d7becde019d9bf8d29459/distrib/miniroot/install.sub#L3315
> > 
> >      # If we got a timestamp from the cgi server, and that time diffs by more
> >      # than 120 seconds, ask if the user wants to adjust the time.
> >      if _time=$(http_time) && _now=$(date +%s) &&
> >          (( _now - _time > 120 || _time - _now > 120 )); then
> >          ln -sf /mnt/usr/share/zoneinfo/$TZ /etc/localtime
> >          if ask_yn "Time appears wrong.  Set to '$(date -r
> > "$(http_time)")'?" yes; then
> >              date $(date -r "$(http_time)" "+%Y%m%d%H%M.%S") >/dev/null
> >              # N.B. This will screw up SECONDS.
> >          fi
> >          rm -f /etc/localtime
> >      fi
> 
> I just tried some older versions of QEMU (where it used to work fine), but
> the error is still there. Is maybe the time of the server wrong?

Yeah, I think this is it - the openbsd server is reporting the wrnog time


$ wget -O cgiinfo.txt https://ftplist1.openbsd.org/cgi-bin/ftplist.cgi?dbversion=1
$ date -d"@$(grep TIME cgiinfo.txt| awk -F= {'print $2}')"
Mon 21 Oct 07:10:08 BST 2024
$ date
Mon 21 Oct 12:03:48 BST 2024


IOW, adding this line to our installer recipe looks wrong. We need to file
a bug somewhere to get the ftplist1.openbsd.org server time fixed.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|