[PATCH] automation/cirrus-ci: store xen/.config as an artifact

[PATCH] automation/cirrus-ci: store xen/.config as an artifact

[Roger Pau Monne]

Always store xen/.config as an artifact, renamed to xen-config to match
the naming used in the Gitlab CI tests.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
 .cirrus.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index e2949d99d73a..1a39f5026f9a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,6 +15,14 @@ freebsd_template: &FREEBSD_ENV
     APPEND_INCLUDES: /usr/local/include
     CIRRUS_CLONE_DEPTH: 1
 
+freebsd_artifacts: &FREEBSD_ARTIFACTS
+  always:
+    rename_script:
+      - cp xen/.config xen-config
+    config_artifacts:
+      path: xen-config
+      type: text/plain
+
 freebsd_full_build_template: &FREEBSD_FULL_BUILD_TEMPLATE
   << : *FREEBSD_ENV
 
@@ -28,6 +36,8 @@ freebsd_full_build_template: &FREEBSD_FULL_BUILD_TEMPLATE
     - ./configure --with-system-seabios=/usr/local/share/seabios/bios.bin
     - gmake -j`sysctl -n hw.ncpu` clang=y
 
+  << : *FREEBSD_ARTIFACTS
+
 freebsd_randconfig_template: &FREEBSD_RANDCONFIG_TEMPLATE
   << : *FREEBSD_ENV
 
@@ -39,6 +49,8 @@ freebsd_randconfig_template: &FREEBSD_RANDCONFIG_TEMPLATE
             KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig
     - gmake -j`sysctl -n hw.ncpu` build-xen clang=y
 
+  << : *FREEBSD_ARTIFACTS
+
 task:
   name: 'FreeBSD 13: full build'
   << : *FREEBSD_13
-- 
2.48.1

Re: [PATCH] automation/cirrus-ci: store xen/.config as an artifact

[Andrew Cooper]

On 10/03/2025 6:16 pm, Roger Pau Monne wrote:
> Always store xen/.config as an artifact, renamed to xen-config to match
> the naming used in the Gitlab CI tests.
>
> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Looking at this, I suspect my failure was caused by trying to capture
".config" directly.

> ---
>  .cirrus.yml | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index e2949d99d73a..1a39f5026f9a 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -15,6 +15,14 @@ freebsd_template: &FREEBSD_ENV
>      APPEND_INCLUDES: /usr/local/include
>      CIRRUS_CLONE_DEPTH: 1
>  
> +freebsd_artifacts: &FREEBSD_ARTIFACTS
> +  always:
> +    rename_script:
> +      - cp xen/.config xen-config
> +    config_artifacts:
> +      path: xen-config
> +      type: text/plain

Can't this be part of freebsd_template directly?

Or is there an ordering problem with the regular build_script ?

~Andrew

Re: [PATCH] automation/cirrus-ci: store xen/.config as an artifact

[Roger Pau Monné]

On Mon, Mar 10, 2025 at 06:30:15PM +0000, Andrew Cooper wrote:
> On 10/03/2025 6:16 pm, Roger Pau Monne wrote:
> > Always store xen/.config as an artifact, renamed to xen-config to match
> > the naming used in the Gitlab CI tests.
> >
> > Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> 
> Looking at this, I suspect my failure was caused by trying to capture
> ".config" directly.
> 
> > ---
> >  .cirrus.yml | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> >
> > diff --git a/.cirrus.yml b/.cirrus.yml
> > index e2949d99d73a..1a39f5026f9a 100644
> > --- a/.cirrus.yml
> > +++ b/.cirrus.yml
> > @@ -15,6 +15,14 @@ freebsd_template: &FREEBSD_ENV
> >      APPEND_INCLUDES: /usr/local/include
> >      CIRRUS_CLONE_DEPTH: 1
> >  
> > +freebsd_artifacts: &FREEBSD_ARTIFACTS
> > +  always:
> > +    rename_script:
> > +      - cp xen/.config xen-config
> > +    config_artifacts:
> > +      path: xen-config
> > +      type: text/plain
> 
> Can't this be part of freebsd_template directly?
> 
> Or is there an ordering problem with the regular build_script ?

Exactly, that was my first attempt (placing it in freebsd_template),
but then the collection would be done before the build, as
freebsd_template sets the env variables ahead of the build, see:

https://cirrus-ci.com/task/5086615544004608

Thanks, Roger.

Re: [PATCH] automation/cirrus-ci: store xen/.config as an artifact

[Andrew Cooper]

On 10/03/2025 6:38 pm, Roger Pau Monné wrote:
> On Mon, Mar 10, 2025 at 06:30:15PM +0000, Andrew Cooper wrote:
>> On 10/03/2025 6:16 pm, Roger Pau Monne wrote:
>>> Always store xen/.config as an artifact, renamed to xen-config to match
>>> the naming used in the Gitlab CI tests.
>>>
>>> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
>> Looking at this, I suspect my failure was caused by trying to capture
>> ".config" directly.
>>
>>> ---
>>>  .cirrus.yml | 12 ++++++++++++
>>>  1 file changed, 12 insertions(+)
>>>
>>> diff --git a/.cirrus.yml b/.cirrus.yml
>>> index e2949d99d73a..1a39f5026f9a 100644
>>> --- a/.cirrus.yml
>>> +++ b/.cirrus.yml
>>> @@ -15,6 +15,14 @@ freebsd_template: &FREEBSD_ENV
>>>      APPEND_INCLUDES: /usr/local/include
>>>      CIRRUS_CLONE_DEPTH: 1
>>>  
>>> +freebsd_artifacts: &FREEBSD_ARTIFACTS
>>> +  always:
>>> +    rename_script:
>>> +      - cp xen/.config xen-config
>>> +    config_artifacts:
>>> +      path: xen-config
>>> +      type: text/plain
>> Can't this be part of freebsd_template directly?
>>
>> Or is there an ordering problem with the regular build_script ?
> Exactly, that was my first attempt (placing it in freebsd_template),
> but then the collection would be done before the build, as
> freebsd_template sets the env variables ahead of the build, see:
>
> https://cirrus-ci.com/task/5086615544004608
>
> Thanks, Roger.

Ok.

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [PATCH] automation/cirrus-ci: store xen/.config as an artifact

[Stefano Stabellini]

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

On Mon, 10 Mar 2025, Andrew Cooper wrote:
> On 10/03/2025 6:38 pm, Roger Pau Monné wrote:
> > On Mon, Mar 10, 2025 at 06:30:15PM +0000, Andrew Cooper wrote:
> >> On 10/03/2025 6:16 pm, Roger Pau Monne wrote:
> >>> Always store xen/.config as an artifact, renamed to xen-config to match
> >>> the naming used in the Gitlab CI tests.
> >>>
> >>> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> >>> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> >> Looking at this, I suspect my failure was caused by trying to capture
> >> ".config" directly.
> >>
> >>> ---
> >>>  .cirrus.yml | 12 ++++++++++++
> >>>  1 file changed, 12 insertions(+)
> >>>
> >>> diff --git a/.cirrus.yml b/.cirrus.yml
> >>> index e2949d99d73a..1a39f5026f9a 100644
> >>> --- a/.cirrus.yml
> >>> +++ b/.cirrus.yml
> >>> @@ -15,6 +15,14 @@ freebsd_template: &FREEBSD_ENV
> >>>      APPEND_INCLUDES: /usr/local/include
> >>>      CIRRUS_CLONE_DEPTH: 1
> >>>  
> >>> +freebsd_artifacts: &FREEBSD_ARTIFACTS
> >>> +  always:
> >>> +    rename_script:
> >>> +      - cp xen/.config xen-config
> >>> +    config_artifacts:
> >>> +      path: xen-config
> >>> +      type: text/plain
> >> Can't this be part of freebsd_template directly?
> >>
> >> Or is there an ordering problem with the regular build_script ?
> > Exactly, that was my first attempt (placing it in freebsd_template),
> > but then the collection would be done before the build, as
> > freebsd_template sets the env variables ahead of the build, see:
> >
> > https://cirrus-ci.com/task/5086615544004608
> >
> > Thanks, Roger.
> 
> Ok.
> 
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>