.../build/projects/osinfo-db-tools.yml | 1 - jenkins/jobs/meson.yaml | 39 ------------------- jenkins/projects/osinfo-db-tools.yaml | 4 +- 3 files changed, 1 insertion(+), 43 deletions(-)
It's been agreed that the projects using libvirt-jenkins-ci would have
the `syntax-check` running as part of their test suite. Therefore,
there's no reason for keeping a job which is not going to be used.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
.../build/projects/osinfo-db-tools.yml | 1 -
jenkins/jobs/meson.yaml | 39 -------------------
jenkins/projects/osinfo-db-tools.yaml | 4 +-
3 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
index d142e0e..67e5f00 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
@@ -17,7 +17,6 @@
- include: '{{ playbook_base }}/jobs/prepare.yml'
- include: '{{ playbook_base }}/jobs/meson-build-job.yml'
-- include: '{{ playbook_base }}/jobs/meson-syntax-check-job.yml'
- include: '{{ playbook_base }}/jobs/meson-check-job.yml'
- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
vars:
diff --git a/jenkins/jobs/meson.yaml b/jenkins/jobs/meson.yaml
index 02e4395..102d0a4 100644
--- a/jenkins/jobs/meson.yaml
+++ b/jenkins/jobs/meson.yaml
@@ -53,45 +53,6 @@
notify-every-unstable-build: false
send-to-individuals: false
-- job-template:
- id: meson-syntax-check-job
- name: '{name}-syntax-check'
- project-type: matrix
- description: '{title} Syntax Check'
- workspace: '{name}'
- child-workspace: '.'
- block-downstream: true
- block-upstream: true
- wrappers:
- - timeout:
- abort: true
- type: absolute
- timeout: 90
- write-description: 'Aborted build after 90 minutes'
- properties:
- - build-discarder:
- days-to-keep: 30
- num-to-keep: 1000
- triggers:
- - reverse:
- jobs: '{obj:parent_jobs}'
- axes:
- - axis:
- name: systems
- type: slave
- values: '{obj:machines}'
- builders:
- - shell: |
- {global_env}
- {local_env}
- cd build
- ninja syntax-check
- publishers:
- - email:
- recipients: '{obj:spam}'
- notify-every-unstable-build: false
- send-to-individuals: false
-
- job-template:
id: meson-check-job
name: '{name}-check'
diff --git a/jenkins/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml
index 2a9ea11..8609b46 100644
--- a/jenkins/projects/osinfo-db-tools.yaml
+++ b/jenkins/projects/osinfo-db-tools.yaml
@@ -16,10 +16,8 @@
jobs:
- meson-build-job:
parent_jobs:
- - meson-syntax-check-job:
- parent_jobs: 'osinfo-db-tools-build'
- meson-check-job:
- parent_jobs: 'osinfo-db-tools-syntax-check'
+ parent_jobs: 'osinfo-db-tools-build'
- meson-rpm-job:
parent_jobs: 'osinfo-db-tools-check'
machines:
--
2.23.0
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-listOn Wed, Sep 18, 2019 at 06:19:54PM +0200, Fabiano Fidêncio wrote:
> It's been agreed that the projects using libvirt-jenkins-ci would have
> the `syntax-check` running as part of their test suite. Therefore,
> there's no reason for keeping a job which is not going to be used.
>
> Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
> ---
> .../build/projects/osinfo-db-tools.yml | 1 -
> jenkins/jobs/meson.yaml | 39 -------------------
> jenkins/projects/osinfo-db-tools.yaml | 4 +-
> 3 files changed, 1 insertion(+), 43 deletions(-)
>
> diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
> index d142e0e..67e5f00 100644
> --- a/guests/playbooks/build/projects/osinfo-db-tools.yml
> +++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
> @@ -17,7 +17,6 @@
>
> - include: '{{ playbook_base }}/jobs/prepare.yml'
> - include: '{{ playbook_base }}/jobs/meson-build-job.yml'
> -- include: '{{ playbook_base }}/jobs/meson-syntax-check-job.yml'
> - include: '{{ playbook_base }}/jobs/meson-check-job.yml'
> - include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
> vars:
> diff --git a/jenkins/jobs/meson.yaml b/jenkins/jobs/meson.yaml
> index 02e4395..102d0a4 100644
> --- a/jenkins/jobs/meson.yaml
> +++ b/jenkins/jobs/meson.yaml
> @@ -53,45 +53,6 @@
> notify-every-unstable-build: false
> send-to-individuals: false
>
> -- job-template:
> - id: meson-syntax-check-job
> - name: '{name}-syntax-check'
> - project-type: matrix
> - description: '{title} Syntax Check'
> - workspace: '{name}'
> - child-workspace: '.'
> - block-downstream: true
> - block-upstream: true
> - wrappers:
> - - timeout:
> - abort: true
> - type: absolute
> - timeout: 90
> - write-description: 'Aborted build after 90 minutes'
> - properties:
> - - build-discarder:
> - days-to-keep: 30
> - num-to-keep: 1000
> - triggers:
> - - reverse:
> - jobs: '{obj:parent_jobs}'
> - axes:
> - - axis:
> - name: systems
> - type: slave
> - values: '{obj:machines}'
> - builders:
> - - shell: |
> - {global_env}
> - {local_env}
> - cd build
> - ninja syntax-check
Instead of removing the syntax-check job we can keep it if we use
'suite' labels for our tests in a way that we would use 'syntax' label
for syntax-check tests and 'unit' label for unit tests.
That way the syntax-check job will call
`meson test --suite syntax`
and check job will call
`meson test --suite unit`
Pavel
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Thu, Sep 19, 2019 at 11:11 AM Pavel Hrdina <phrdina@redhat.com> wrote:
>
> On Wed, Sep 18, 2019 at 06:19:54PM +0200, Fabiano Fidêncio wrote:
> > It's been agreed that the projects using libvirt-jenkins-ci would have
> > the `syntax-check` running as part of their test suite. Therefore,
> > there's no reason for keeping a job which is not going to be used.
> >
> > Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
> > ---
> > .../build/projects/osinfo-db-tools.yml | 1 -
> > jenkins/jobs/meson.yaml | 39 -------------------
> > jenkins/projects/osinfo-db-tools.yaml | 4 +-
> > 3 files changed, 1 insertion(+), 43 deletions(-)
> >
> > diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
> > index d142e0e..67e5f00 100644
> > --- a/guests/playbooks/build/projects/osinfo-db-tools.yml
> > +++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
> > @@ -17,7 +17,6 @@
> >
> > - include: '{{ playbook_base }}/jobs/prepare.yml'
> > - include: '{{ playbook_base }}/jobs/meson-build-job.yml'
> > -- include: '{{ playbook_base }}/jobs/meson-syntax-check-job.yml'
> > - include: '{{ playbook_base }}/jobs/meson-check-job.yml'
> > - include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
> > vars:
> > diff --git a/jenkins/jobs/meson.yaml b/jenkins/jobs/meson.yaml
> > index 02e4395..102d0a4 100644
> > --- a/jenkins/jobs/meson.yaml
> > +++ b/jenkins/jobs/meson.yaml
> > @@ -53,45 +53,6 @@
> > notify-every-unstable-build: false
> > send-to-individuals: false
> >
> > -- job-template:
> > - id: meson-syntax-check-job
> > - name: '{name}-syntax-check'
> > - project-type: matrix
> > - description: '{title} Syntax Check'
> > - workspace: '{name}'
> > - child-workspace: '.'
> > - block-downstream: true
> > - block-upstream: true
> > - wrappers:
> > - - timeout:
> > - abort: true
> > - type: absolute
> > - timeout: 90
> > - write-description: 'Aborted build after 90 minutes'
> > - properties:
> > - - build-discarder:
> > - days-to-keep: 30
> > - num-to-keep: 1000
> > - triggers:
> > - - reverse:
> > - jobs: '{obj:parent_jobs}'
> > - axes:
> > - - axis:
> > - name: systems
> > - type: slave
> > - values: '{obj:machines}'
> > - builders:
> > - - shell: |
> > - {global_env}
> > - {local_env}
> > - cd build
> > - ninja syntax-check
>
> Instead of removing the syntax-check job we can keep it if we use
> 'suite' labels for our tests in a way that we would use 'syntax' label
> for syntax-check tests and 'unit' label for unit tests.
>
> That way the syntax-check job will call
>
> `meson test --suite syntax`
>
> and check job will call
>
> `meson test --suite unit`
Personally, I don't see a valid point on keeping the job.
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Sep 23, 2019 at 12:10:21PM +0200, Fabiano Fidêncio wrote:
> On Thu, Sep 19, 2019 at 11:11 AM Pavel Hrdina <phrdina@redhat.com> wrote:
> >
> > On Wed, Sep 18, 2019 at 06:19:54PM +0200, Fabiano Fidêncio wrote:
> > > It's been agreed that the projects using libvirt-jenkins-ci would have
> > > the `syntax-check` running as part of their test suite. Therefore,
> > > there's no reason for keeping a job which is not going to be used.
> > >
> > > Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
> > > ---
> > > .../build/projects/osinfo-db-tools.yml | 1 -
> > > jenkins/jobs/meson.yaml | 39 -------------------
> > > jenkins/projects/osinfo-db-tools.yaml | 4 +-
> > > 3 files changed, 1 insertion(+), 43 deletions(-)
> > >
> > > diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
> > > index d142e0e..67e5f00 100644
> > > --- a/guests/playbooks/build/projects/osinfo-db-tools.yml
> > > +++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
> > > @@ -17,7 +17,6 @@
> > >
> > > - include: '{{ playbook_base }}/jobs/prepare.yml'
> > > - include: '{{ playbook_base }}/jobs/meson-build-job.yml'
> > > -- include: '{{ playbook_base }}/jobs/meson-syntax-check-job.yml'
> > > - include: '{{ playbook_base }}/jobs/meson-check-job.yml'
> > > - include: '{{ playbook_base }}/jobs/meson-rpm-job.yml'
> > > vars:
> > > diff --git a/jenkins/jobs/meson.yaml b/jenkins/jobs/meson.yaml
> > > index 02e4395..102d0a4 100644
> > > --- a/jenkins/jobs/meson.yaml
> > > +++ b/jenkins/jobs/meson.yaml
> > > @@ -53,45 +53,6 @@
> > > notify-every-unstable-build: false
> > > send-to-individuals: false
> > >
> > > -- job-template:
> > > - id: meson-syntax-check-job
> > > - name: '{name}-syntax-check'
> > > - project-type: matrix
> > > - description: '{title} Syntax Check'
> > > - workspace: '{name}'
> > > - child-workspace: '.'
> > > - block-downstream: true
> > > - block-upstream: true
> > > - wrappers:
> > > - - timeout:
> > > - abort: true
> > > - type: absolute
> > > - timeout: 90
> > > - write-description: 'Aborted build after 90 minutes'
> > > - properties:
> > > - - build-discarder:
> > > - days-to-keep: 30
> > > - num-to-keep: 1000
> > > - triggers:
> > > - - reverse:
> > > - jobs: '{obj:parent_jobs}'
> > > - axes:
> > > - - axis:
> > > - name: systems
> > > - type: slave
> > > - values: '{obj:machines}'
> > > - builders:
> > > - - shell: |
> > > - {global_env}
> > > - {local_env}
> > > - cd build
> > > - ninja syntax-check
> >
> > Instead of removing the syntax-check job we can keep it if we use
> > 'suite' labels for our tests in a way that we would use 'syntax' label
> > for syntax-check tests and 'unit' label for unit tests.
> >
> > That way the syntax-check job will call
> >
> > `meson test --suite syntax`
> >
> > and check job will call
> >
> > `meson test --suite unit`
>
> Personally, I don't see a valid point on keeping the job.
I don't have a preference here, both works for me. The benefit of
having single job is that if we ever introduce new --suite label we get
it for free in our CI.
Pavel
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, 2019-09-23 at 12:10 +0200, Fabiano Fidêncio wrote: > On Thu, Sep 19, 2019 at 11:11 AM Pavel Hrdina <phrdina@redhat.com> wrote: > > Instead of removing the syntax-check job we can keep it if we use > > 'suite' labels for our tests in a way that we would use 'syntax' label > > for syntax-check tests and 'unit' label for unit tests. > > > > That way the syntax-check job will call > > > > `meson test --suite syntax` > > > > and check job will call > > > > `meson test --suite unit` > > Personally, I don't see a valid point on keeping the job. Same here. Dan was arguing for keeping it, however. I wonder if he changed his mind in the meantime... -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Sep 23, 2019 at 12:43:18PM +0200, Andrea Bolognani wrote: > On Mon, 2019-09-23 at 12:10 +0200, Fabiano Fidêncio wrote: > > On Thu, Sep 19, 2019 at 11:11 AM Pavel Hrdina <phrdina@redhat.com> wrote: > > > Instead of removing the syntax-check job we can keep it if we use > > > 'suite' labels for our tests in a way that we would use 'syntax' label > > > for syntax-check tests and 'unit' label for unit tests. > > > > > > That way the syntax-check job will call > > > > > > `meson test --suite syntax` > > > > > > and check job will call > > > > > > `meson test --suite unit` > > > > Personally, I don't see a valid point on keeping the job. > > Same here. Dan was arguing for keeping it, however. I wonder if he > changed his mind in the meantime... I'd prefer separate, but I'm not going to block it if everyone else things it is better to have a single job. 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 :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, 2019-09-23 at 11:47 +0100, Daniel P. Berrangé wrote: > On Mon, Sep 23, 2019 at 12:43:18PM +0200, Andrea Bolognani wrote: > > On Mon, 2019-09-23 at 12:10 +0200, Fabiano Fidêncio wrote: > > > On Thu, Sep 19, 2019 at 11:11 AM Pavel Hrdina <phrdina@redhat.com> wrote: > > > > Instead of removing the syntax-check job we can keep it if we use > > > > 'suite' labels for our tests in a way that we would use 'syntax' label > > > > for syntax-check tests and 'unit' label for unit tests. > > > > > > > > That way the syntax-check job will call > > > > > > > > `meson test --suite syntax` > > > > > > > > and check job will call > > > > > > > > `meson test --suite unit` > > > > > > Personally, I don't see a valid point on keeping the job. > > > > Same here. Dan was arguing for keeping it, however. I wonder if he > > changed his mind in the meantime... > > I'd prefer separate, but I'm not going to block it if everyone else things > it is better to have a single job. Since me and Fabiano are for having a single job, Pavel is okay with either solution and you would prefer separate jobs but don't feel strongly enough about that to NACK the other solution, let's slap a Reviewed-by: Andrea Bolognani <abologna@redhat.com> on this bad boy and move on :) Fabiano, let me know when it's a good time to push the patch and apply the changes. -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Sep 23, 2019 at 1:16 PM Andrea Bolognani <abologna@redhat.com> wrote: > > On Mon, 2019-09-23 at 11:47 +0100, Daniel P. Berrangé wrote: > > On Mon, Sep 23, 2019 at 12:43:18PM +0200, Andrea Bolognani wrote: > > > On Mon, 2019-09-23 at 12:10 +0200, Fabiano Fidêncio wrote: > > > > On Thu, Sep 19, 2019 at 11:11 AM Pavel Hrdina <phrdina@redhat.com> wrote: > > > > > Instead of removing the syntax-check job we can keep it if we use > > > > > 'suite' labels for our tests in a way that we would use 'syntax' label > > > > > for syntax-check tests and 'unit' label for unit tests. > > > > > > > > > > That way the syntax-check job will call > > > > > > > > > > `meson test --suite syntax` > > > > > > > > > > and check job will call > > > > > > > > > > `meson test --suite unit` > > > > > > > > Personally, I don't see a valid point on keeping the job. > > > > > > Same here. Dan was arguing for keeping it, however. I wonder if he > > > changed his mind in the meantime... > > > > I'd prefer separate, but I'm not going to block it if everyone else things > > it is better to have a single job. > > Since me and Fabiano are for having a single job, Pavel is okay with > either solution and you would prefer separate jobs but don't feel > strongly enough about that to NACK the other solution, let's slap a > > Reviewed-by: Andrea Bolognani <abologna@redhat.com> > > on this bad boy and move on :) > > Fabiano, let me know when it's a good time to push the patch and > apply the changes. Feel free to merge it whenever you have time. It's not going to cause any breakage on osinfo-db-tools. :-) Best Regards, -- Fabiano Fidêncio -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, 2019-09-23 at 13:24 +0200, Fabiano Fidêncio wrote: > On Mon, Sep 23, 2019 at 1:16 PM Andrea Bolognani <abologna@redhat.com> wrote: > > Fabiano, let me know when it's a good time to push the patch and > > apply the changes. > > Feel free to merge it whenever you have time. It's not going to cause > any breakage on osinfo-db-tools. :-) Fair enough! I just noticed you forgot to drop guests/playbooks/build/jobs/meson-syntax-check-job.yml along with the corresponding Jenkins rule, so I'll do that before pushing. -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2024 Red Hat, Inc.