Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- 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