[libvirt] [jenkins-ci PATCH 0/3] Various fixes to Perl jobs
Andrea Bolognani (3): jobs: Run commands after loading environments jobs: Use local_env for Perl test arguments jobs: Use *-check for Perl jobs too jobs/perl-makemaker.yaml | 11 +++++------ jobs/perl-modulebuild.yaml | 6 +++--- projects/libvirt-perl.yaml | 7 ++++--- projects/libvirt-tck.yaml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) -- 2.17.0
The contents of either global_env or local_env might affect the behavior of the build, so no command should be executed before loading them both. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- jobs/perl-makemaker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 84b368e..065b38e 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -40,9 +40,9 @@ values: '{obj:machines}' builders: - shell: | - perl Makefile.PL PREFIX="$VIRT_PREFIX" {global_env} {local_env} + perl Makefile.PL PREFIX="$VIRT_PREFIX" $MAKE $MAKE -j{smp} install $MAKE -j{smp} manifest -- 2.17.0
On Thu, May 10, 2018 at 05:35:43PM +0200, Andrea Bolognani wrote:
The contents of either global_env or local_env might affect the behavior of the build, so no command should be executed before loading them both.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
We're already using this approach for Go tests, the main advantage being that we can use existing facilities instead of defining custom one-use variables. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- jobs/perl-makemaker.yaml | 3 +-- projects/libvirt-perl.yaml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 065b38e..491b7fa 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -58,7 +58,6 @@ name: '{name}-{branch}-test{variant}' project-type: matrix description: '{title} Test' - test_args: '' workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true @@ -85,7 +84,7 @@ - shell: | {global_env} {local_env} - $MAKE -j{smp} test {test_args} + $MAKE -j{smp} test $TEST_ARGS publishers: - email: recipients: '{obj:spam}' diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 0a6f648..165470a 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -8,7 +8,8 @@ parent_jobs: 'libvirt-master-build' - perl-makemaker-test-job: parent_jobs: 'libvirt-perl-master-build' - test_args: 'TEST_MAINTAINER=1' + local_env: | + export TEST_ARGS="TEST_MAINTAINER=1" - perl-makemaker-rpm-job: parent_jobs: 'libvirt-perl-master-test' machines: '{rpm_machines}' -- 2.17.0
On Thu, May 10, 2018 at 05:35:44PM +0200, Andrea Bolognani wrote:
We're already using this approach for Go tests, the main advantage being that we can use existing facilities instead of defining custom one-use variables.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Perl jobs use the -test suffix instead of -check, which is used everywhere else. Rename them in order to be consistent. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- jobs/perl-makemaker.yaml | 6 +++--- jobs/perl-modulebuild.yaml | 6 +++--- projects/libvirt-perl.yaml | 4 ++-- projects/libvirt-tck.yaml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 491b7fa..29bf2a1 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -54,10 +54,10 @@ - job-template: - id: perl-makemaker-test-job - name: '{name}-{branch}-test{variant}' + id: perl-makemaker-check-job + name: '{name}-{branch}-check{variant}' project-type: matrix - description: '{title} Test' + description: '{title} Check' workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index b159ab3..65c1710 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -54,10 +54,10 @@ - job-template: - id: perl-modulebuild-test-job - name: '{name}-{branch}-test{variant}' + id: perl-modulebuild-check-job + name: '{name}-{branch}-check{variant}' project-type: matrix - description: '{title} Test' + description: '{title} Check' workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 165470a..8023cfe 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -6,10 +6,10 @@ jobs: - perl-makemaker-build-job: parent_jobs: 'libvirt-master-build' - - perl-makemaker-test-job: + - perl-makemaker-check-job: parent_jobs: 'libvirt-perl-master-build' local_env: | export TEST_ARGS="TEST_MAINTAINER=1" - perl-makemaker-rpm-job: - parent_jobs: 'libvirt-perl-master-test' + parent_jobs: 'libvirt-perl-master-check' machines: '{rpm_machines}' diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index 25b674a..065678d 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -13,10 +13,10 @@ jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-perl-master-build' - - perl-modulebuild-test-job: + - perl-modulebuild-check-job: parent_jobs: 'libvirt-tck-master-build' - perl-modulebuild-rpm-job: - parent_jobs: 'libvirt-tck-master-test' + parent_jobs: 'libvirt-tck-master-check' machines: - libvirt-fedora-27 - libvirt-fedora-28 -- 2.17.0
On Thu, May 10, 2018 at 05:35:45PM +0200, Andrea Bolognani wrote:
Perl jobs use the -test suffix instead of -check, which is used everywhere else. Rename them in order to be consistent.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> ---
Reviewed-by: Erik Skultety <eskultet@redhat.com>
On Wed, 2018-05-16 at 17:42 +0200, Erik Skultety wrote:
On Thu, May 10, 2018 at 05:35:45PM +0200, Andrea Bolognani wrote:
Perl jobs use the -test suffix instead of -check, which is used everywhere else. Rename them in order to be consistent.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> ---
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Thanks, I've pushed this patch; the other patches in the series are no longer relevant since we're in the process of switching libvirt-perl to Module::Build and removing ExtUtils::MakeMaker support, so I've skipped them to reduce churn. -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Erik Skultety