1. Patchew
  2. Libvirt
  3. View series

[PATCH] ci: Refresh generated files

Martin Kletzander posted 1 patch 1 year, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/76802e5dc6ccce6c32ca0e958626c8d3f6d36bff.1653651388.git.mkletzan@redhat.com
ci/gitlab.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH] ci: Refresh generated files
Posted by Martin Kletzander 1 year, 11 months ago 
Notable changes:

* 'lcitool manifest' now generates absolute include paths

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
Pushed under the 'build-breaker' and 'just-ci-update' rules (just in case the latter also exists).

 ci/gitlab.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 379a41111cab..cab4e6074c21 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -5,8 +5,8 @@
 # https://gitlab.com/libvirt/libvirt-ci
 
 include:
-  - local: 'ci/gitlab/container-templates.yml'
-  - local: 'ci/gitlab/build-templates.yml'
-  - local: 'ci/gitlab/sanity-checks.yml'
-  - local: 'ci/gitlab/containers.yml'
-  - local: 'ci/gitlab/builds.yml'
+  - local: '/ci/gitlab/container-templates.yml'
+  - local: '/ci/gitlab/build-templates.yml'
+  - local: '/ci/gitlab/sanity-checks.yml'
+  - local: '/ci/gitlab/containers.yml'
+  - local: '/ci/gitlab/builds.yml'
-- 
2.35.1
Re: [PATCH] ci: Refresh generated files
Posted by Daniel P. Berrangé 1 year, 11 months ago 
On Fri, May 27, 2022 at 01:37:10PM +0200, Martin Kletzander wrote:
> Notable changes:
> 
> * 'lcitool manifest' now generates absolute include paths
> 
> Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
> ---
> Pushed under the 'build-breaker' and 'just-ci-update' rules (just in case the latter also exists).

Unfortunately this change is not needed and won't fix the
reported build problem. We need the .gitlab-ci.yml to
add 'optional: true' to the 'needs:' in the failing jobs.

> 
>  ci/gitlab.yml | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/ci/gitlab.yml b/ci/gitlab.yml
> index 379a41111cab..cab4e6074c21 100644
> --- a/ci/gitlab.yml
> +++ b/ci/gitlab.yml
> @@ -5,8 +5,8 @@
>  # https://gitlab.com/libvirt/libvirt-ci
>  
>  include:
> -  - local: 'ci/gitlab/container-templates.yml'
> -  - local: 'ci/gitlab/build-templates.yml'
> -  - local: 'ci/gitlab/sanity-checks.yml'
> -  - local: 'ci/gitlab/containers.yml'
> -  - local: 'ci/gitlab/builds.yml'
> +  - local: '/ci/gitlab/container-templates.yml'
> +  - local: '/ci/gitlab/build-templates.yml'
> +  - local: '/ci/gitlab/sanity-checks.yml'
> +  - local: '/ci/gitlab/containers.yml'
> +  - local: '/ci/gitlab/builds.yml'
> -- 
> 2.35.1
> 

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] ci: Refresh generated files
Posted by Martin Kletzander 1 year, 11 months ago 
On Fri, May 27, 2022 at 12:45:17PM +0100, Daniel P. Berrangé wrote:
>On Fri, May 27, 2022 at 01:37:10PM +0200, Martin Kletzander wrote:
>> Notable changes:
>>
>> * 'lcitool manifest' now generates absolute include paths
>>
>> Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
>> ---
>> Pushed under the 'build-breaker' and 'just-ci-update' rules (just in case the latter also exists).
>
>Unfortunately this change is not needed and won't fix the
>reported build problem. We need the .gitlab-ci.yml to
>add 'optional: true' to the 'needs:' in the failing jobs.
>

It took me a while to understand it, but what you're saying is that the
container jobs are not even defined if the dockerfiles are not changed
and hence the dependency cannot be resolved?  If that's it then good, if
not, then I'm baffled once again.

>>
>>  ci/gitlab.yml | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/ci/gitlab.yml b/ci/gitlab.yml
>> index 379a41111cab..cab4e6074c21 100644
>> --- a/ci/gitlab.yml
>> +++ b/ci/gitlab.yml
>> @@ -5,8 +5,8 @@
>>  # https://gitlab.com/libvirt/libvirt-ci
>>
>>  include:
>> -  - local: 'ci/gitlab/container-templates.yml'
>> -  - local: 'ci/gitlab/build-templates.yml'
>> -  - local: 'ci/gitlab/sanity-checks.yml'
>> -  - local: 'ci/gitlab/containers.yml'
>> -  - local: 'ci/gitlab/builds.yml'
>> +  - local: '/ci/gitlab/container-templates.yml'
>> +  - local: '/ci/gitlab/build-templates.yml'
>> +  - local: '/ci/gitlab/sanity-checks.yml'
>> +  - local: '/ci/gitlab/containers.yml'
>> +  - local: '/ci/gitlab/builds.yml'
>> --
>> 2.35.1
>>
>
>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] ci: Refresh generated files
Posted by Daniel P. Berrangé 1 year, 11 months ago 
On Fri, May 27, 2022 at 02:47:20PM +0200, Martin Kletzander wrote:
> On Fri, May 27, 2022 at 12:45:17PM +0100, Daniel P. Berrangé wrote:
> > On Fri, May 27, 2022 at 01:37:10PM +0200, Martin Kletzander wrote:
> > > Notable changes:
> > > 
> > > * 'lcitool manifest' now generates absolute include paths
> > > 
> > > Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
> > > ---
> > > Pushed under the 'build-breaker' and 'just-ci-update' rules (just in case the latter also exists).
> > 
> > Unfortunately this change is not needed and won't fix the
> > reported build problem. We need the .gitlab-ci.yml to
> > add 'optional: true' to the 'needs:' in the failing jobs.
> > 
> 
> It took me a while to understand it, but what you're saying is that the
> container jobs are not even defined if the dockerfiles are not changed
> and hence the dependency cannot be resolved?  If that's it then good, if
> not, then I'm baffled once again.

Essentially yes.

Consider the rules in .container_job:

  rules:
    - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
      when: on_success
      changes:
       - ci/gitlab/container-templates.yml
       - ci/containers/$NAME.Dockerfile
    - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $LIBVIRT_CI_CONTAINERS == "1"'
      when: on_success
    - if: '$CI_PROJECT_NAMESPACE == "libvirt"'
      when: never
    - when: on_success


these are processed in-order and the first match wins. In this
case we're hitting the 3rd rule. The 'when: never' clause causes
the job to cease to exist in the current pipeline execution, and
thus we get the dependency problem you reported.

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 :|

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.