[libvirt] [jenkins-ci PATCH 0/2] Fix archive_format handling
Andrea Bolognani (2): jobs: Move archive_format to defaults projects: Define archive_format for osinfo-db jobs/autotools.yaml | 1 - jobs/defaults.yaml | 1 + jobs/generic.yaml | 1 - jobs/perl-makemaker.yaml | 1 - jobs/perl-modulebuild.yaml | 1 - projects/osinfo-db.yaml | 3 ++- 6 files changed, 3 insertions(+), 5 deletions(-) -- 2.17.0
Instead of repeating the definition all over the place, move it to the defaults where it belongs. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- jobs/autotools.yaml | 1 - jobs/defaults.yaml | 1 + jobs/generic.yaml | 1 - jobs/perl-makemaker.yaml | 1 - jobs/perl-modulebuild.yaml | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 9868573..638be5e 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -140,7 +140,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index 45eedb7..0a1c757 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -20,6 +20,7 @@ - libvirt-fedora-rawhide mingw_machines: - libvirt-fedora-rawhide + archive_format: gz global_env: | local_env: | mingw32_local_env: | diff --git a/jobs/generic.yaml b/jobs/generic.yaml index f64dde0..3e20962 100644 --- a/jobs/generic.yaml +++ b/jobs/generic.yaml @@ -130,7 +130,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml index 84b368e..31f1441 100644 --- a/jobs/perl-makemaker.yaml +++ b/jobs/perl-makemaker.yaml @@ -97,7 +97,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index b159ab3..60374da 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -96,7 +96,6 @@ name: '{name}-{branch}-rpm{variant}' project-type: matrix description: '{title} RPM' - archive_format: gz workspace: '{name}-{branch}{variant}' child-workspace: '.' block-downstream: true -- 2.17.0
On Thu, May 10, 2018 at 05:26:32PM +0200, Andrea Bolognani wrote:
Instead of repeating the definition all over the place, move it to the defaults where it belongs.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Follow the standard templating behavior instead of needlessly hardcoding information in the script. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- projects/osinfo-db.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 0d0a972..9e22c93 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -3,6 +3,7 @@ name: osinfo-db machines: '{all_machines}' title: osinfo database + archive_format: xz jobs: - generic-build-job: parent_jobs: 'osinfo-db-tools-master-build' @@ -17,7 +18,7 @@ parent_jobs: 'osinfo-db-master-check' machines: '{rpm_machines}' command: | - rm -f *.tar.xz + rm -f *.tar.{archive_format} $MAKE osinfo-db.spec perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db.spec $MAKE rpm -- 2.17.0
On Thu, May 10, 2018 at 05:26:33PM +0200, Andrea Bolognani wrote:
Follow the standard templating behavior instead of needlessly hardcoding information in the script.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- projects/osinfo-db.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 0d0a972..9e22c93 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -3,6 +3,7 @@ name: osinfo-db machines: '{all_machines}' title: osinfo database + archive_format: xz
Would it make sense to unify the file formats we use, so it's either all xz or all gzip, I'm sorry if I'm asking the obvious, but I'm not familiar with any historical reasons for such decisions (if there were any). Reviewed-by: Erik Skultety <eskultet@redhat.com>
On Wed, 2018-05-16 at 15:25 +0200, Erik Skultety wrote:
On Thu, May 10, 2018 at 05:26:33PM +0200, Andrea Bolognani wrote:
Follow the standard templating behavior instead of needlessly hardcoding information in the script.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- projects/osinfo-db.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 0d0a972..9e22c93 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -3,6 +3,7 @@ name: osinfo-db machines: '{all_machines}' title: osinfo database + archive_format: xz
Would it make sense to unify the file formats we use, so it's either all xz or all gzip, I'm sorry if I'm asking the obvious, but I'm not familiar with any historical reasons for such decisions (if there were any).
I believe most projects are still using with gzip for hysterical raisins; libvirt itself moved to xz only a couple of years ago. Standardizing on xz would make complete sense to me, but it might not be trivial for projects using non-autotools build systems, plus most will probably not reap the same benefits as libvirt and osinfo-db - both of which include a massive amount of eminently compressible XML files. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, May 16, 2018 at 05:18:56PM +0200, Andrea Bolognani wrote:
On Wed, 2018-05-16 at 15:25 +0200, Erik Skultety wrote:
On Thu, May 10, 2018 at 05:26:33PM +0200, Andrea Bolognani wrote:
Follow the standard templating behavior instead of needlessly hardcoding information in the script.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- projects/osinfo-db.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 0d0a972..9e22c93 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -3,6 +3,7 @@ name: osinfo-db machines: '{all_machines}' title: osinfo database + archive_format: xz
Would it make sense to unify the file formats we use, so it's either all xz or all gzip, I'm sorry if I'm asking the obvious, but I'm not familiar with any historical reasons for such decisions (if there were any).
I believe most projects are still using with gzip for hysterical raisins; libvirt itself moved to xz only a couple of years ago.
Standardizing on xz would make complete sense to me, but it might not be trivial for projects using non-autotools build systems, plus most will probably not reap the same benefits as libvirt and osinfo-db - both of which include a massive amount of eminently compressible XML files.
Python for example only supports tar.xz since Py 3.5. Perl Module::Build only supports tar.gz I don't think we really want to get into the game of ungzipping and then xz'ing archives afterwards, just for sake of consistency. 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 :|
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Erik Skultety