1. Patchew
  2. Libvirt
  3. View series

[libvirt] [jenkins-ci PATCH] projects: switch libvirt-perl over to using Module::Build

Daniel P. Berrangé posted 1 patch 5 years, 11 months ago
Failed in applying to current master (apply log)
jobs/perl-makemaker.yaml   | 136 -------------------------------------
projects/libvirt-perl.yaml |   6 +-
2 files changed, 3 insertions(+), 139 deletions(-)
delete mode 100644 jobs/perl-makemaker.yaml
[libvirt] [jenkins-ci PATCH] projects: switch libvirt-perl over to using Module::Build
Posted by Daniel P. Berrangé 5 years, 11 months ago 
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 jobs/perl-makemaker.yaml   | 136 -------------------------------------
 projects/libvirt-perl.yaml |   6 +-
 2 files changed, 3 insertions(+), 139 deletions(-)
 delete mode 100644 jobs/perl-makemaker.yaml

diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml
deleted file mode 100644
index 84b368e..0000000
--- a/jobs/perl-makemaker.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-
-- job-template:
-    id: perl-makemaker-build-job
-    name: '{name}-{branch}-build{variant}'
-    project-type: matrix
-    description: '{title} Build'
-    autogen_args: ''
-    workspace: '{name}-{branch}{variant}'
-    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
-    scm:
-      - git:
-          url: git://n64.pufty.ci.centos.org/{name}.git
-          branches:
-            - origin/{branch}
-          clean:
-            after: true
-          skip-tag: true
-          wipe-workspace: false
-    triggers:
-      - reverse:
-          jobs: '{obj:parent_jobs}'
-      - pollscm:
-          cron: "H/20 * * * *"
-    axes:
-      - axis:
-          name: systems
-          type: slave
-          values: '{obj:machines}'
-    builders:
-      - shell: |
-          perl Makefile.PL PREFIX="$VIRT_PREFIX"
-          {global_env}
-          {local_env}
-          $MAKE
-          $MAKE -j{smp} install
-          $MAKE -j{smp} manifest
-    publishers:
-      - email:
-          recipients: '{obj:spam}'
-          notify-every-unstable-build: true
-          send-to-individuals: false
-
-
-- job-template:
-    id: perl-makemaker-test-job
-    name: '{name}-{branch}-test{variant}'
-    project-type: matrix
-    description: '{title} Test'
-    test_args: ''
-    workspace: '{name}-{branch}{variant}'
-    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}
-          $MAKE -j{smp} test {test_args}
-    publishers:
-      - email:
-          recipients: '{obj:spam}'
-          notify-every-unstable-build: true
-          send-to-individuals: false
-
-- job-template:
-    id: perl-makemaker-rpm-job
-    name: '{name}-{branch}-rpm{variant}'
-    project-type: matrix
-    description: '{title} RPM'
-    archive_format: gz
-    workspace: '{name}-{branch}{variant}'
-    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}
-          sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec
-          sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec
-          rm -f *.tar.{archive_format}
-          $MAKE -j{smp} dist
-          rpmbuild --define "_topdir `pwd`/rpmbuild" -ta *.tar.{archive_format}
-    publishers:
-      - email:
-          recipients: '{obj:spam}'
-          notify-every-unstable-build: true
-          send-to-individuals: false
diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml
index 0a6f648..37b48ff 100644
--- a/projects/libvirt-perl.yaml
+++ b/projects/libvirt-perl.yaml
@@ -4,11 +4,11 @@
     machines: '{all_machines}'
     title: Libvirt Perl
     jobs:
-      - perl-makemaker-build-job:
+      - perl-modulebuild-build-job:
           parent_jobs: 'libvirt-master-build'
-      - perl-makemaker-test-job:
+      - perl-modulebuild-test-job:
           parent_jobs: 'libvirt-perl-master-build'
           test_args: 'TEST_MAINTAINER=1'
-      - perl-makemaker-rpm-job:
+      - perl-modulebuild-rpm-job:
           parent_jobs: 'libvirt-perl-master-test'
           machines: '{rpm_machines}'
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH] projects: switch libvirt-perl over to using Module::Build
Posted by Andrea Bolognani 5 years, 11 months ago 
On Tue, 2018-05-15 at 16:37 +0100, Daniel P. Berrangé wrote:
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  jobs/perl-makemaker.yaml   | 136 -------------------------------------
>  projects/libvirt-perl.yaml |   6 +-
>  2 files changed, 3 insertions(+), 139 deletions(-)
>  delete mode 100644 jobs/perl-makemaker.yaml
> 
> diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml
> deleted file mode 100644
> index 84b368e..0000000
> --- a/jobs/perl-makemaker.yaml
> +++ /dev/null
> @@ -1,136 +0,0 @@
> -
> -- job-template:
> -    id: perl-makemaker-build-job
> -    name: '{name}-{branch}-build{variant}'
[...]
> -    publishers:
> -      - email:
> -          recipients: '{obj:spam}'
> -          notify-every-unstable-build: true
> -          send-to-individuals: false

This hunk should really be its own commit. Please split it off.

> diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml
> index 0a6f648..37b48ff 100644
> --- a/projects/libvirt-perl.yaml
> +++ b/projects/libvirt-perl.yaml
> @@ -4,11 +4,11 @@
>      machines: '{all_machines}'
>      title: Libvirt Perl
>      jobs:
> -      - perl-makemaker-build-job:
> +      - perl-modulebuild-build-job:
>            parent_jobs: 'libvirt-master-build'
> -      - perl-makemaker-test-job:
> +      - perl-modulebuild-test-job:
>            parent_jobs: 'libvirt-perl-master-build'
>            test_args: 'TEST_MAINTAINER=1'

test_args will no longer work: you need to replace it with

  local_env: |
    export TEST_MAINTAINER=1

so that it will be picked up. Which is a better approach to
begin with, hence

  https://www.redhat.com/archives/libvir-list/2018-May/msg00691.html


If you take care of all of the above, you can pick up my

  Reviewed-by: Andrea Bolognani <abologna@redhat.com>

but you're not quite done yet: you also need to push

  https://www.redhat.com/archives/libvir-list/2018-May/msg01171.html

at the same time to ensure all required packages are installed
on the CI workers.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH] projects: switch libvirt-perl over to using Module::Build
Posted by Andrea Bolognani 5 years, 11 months ago 
On Tue, 2018-05-15 at 20:30 +0200, Andrea Bolognani wrote:
> On Tue, 2018-05-15 at 16:37 +0100, Daniel P. Berrangé wrote:
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >  jobs/perl-makemaker.yaml   | 136 -------------------------------------
> >  projects/libvirt-perl.yaml |   6 +-
> >  2 files changed, 3 insertions(+), 139 deletions(-)
> >  delete mode 100644 jobs/perl-makemaker.yaml
> > 
> > diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml
> > deleted file mode 100644
> > index 84b368e..0000000
> > --- a/jobs/perl-makemaker.yaml
> > +++ /dev/null
> > @@ -1,136 +0,0 @@
> > -
> > -- job-template:
> > -    id: perl-makemaker-build-job
> > -    name: '{name}-{branch}-build{variant}'
> 
> [...]
> > -    publishers:
> > -      - email:
> > -          recipients: '{obj:spam}'
> > -          notify-every-unstable-build: true
> > -          send-to-individuals: false
> 
> This hunk should really be its own commit. Please split it off.
> 
> > diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml
> > index 0a6f648..37b48ff 100644
> > --- a/projects/libvirt-perl.yaml
> > +++ b/projects/libvirt-perl.yaml
> > @@ -4,11 +4,11 @@
> >      machines: '{all_machines}'
> >      title: Libvirt Perl
> >      jobs:
> > -      - perl-makemaker-build-job:
> > +      - perl-modulebuild-build-job:
> >            parent_jobs: 'libvirt-master-build'
> > -      - perl-makemaker-test-job:
> > +      - perl-modulebuild-test-job:
> >            parent_jobs: 'libvirt-perl-master-build'
> >            test_args: 'TEST_MAINTAINER=1'
> 
> test_args will no longer work: you need to replace it with
> 
>   local_env: |
>     export TEST_MAINTAINER=1
> 
> so that it will be picked up. Which is a better approach to
> begin with, hence
> 
>   https://www.redhat.com/archives/libvir-list/2018-May/msg00691.html
> 
> 
> If you take care of all of the above, you can pick up my
> 
>   Reviewed-by: Andrea Bolognani <abologna@redhat.com>
> 
> but you're not quite done yet: you also need to push
> 
>   https://www.redhat.com/archives/libvir-list/2018-May/msg01171.html
> 
> at the same time to ensure all required packages are installed
> on the CI workers.

I've pushed that series, so you can go ahead with your changes.

Note that I have also pushed

  https://www.redhat.com/archives/libvir-list/2018-May/msg00692.html

so, in addition to the fixes mentioned above, you need to make
sure your jobs use 'check' instead of 'test' in their names, and
delete the old jobs once you're done applying the changes.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.