[libvirt] [tck PATCH v2 0/3] Remove Test::AutoBuild leftovers
Changes from [v1]: * rename the script instead of dropping it; * perform some further clean ups. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00218.html Andrea Bolognani (3): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to Test::AutoBuild spec: Drop %{extra_release} perl-Sys-Virt-TCK.spec.PL | 3 +-- autobuild.sh => prepare-release.sh | 15 ++------------- 2 files changed, 3 insertions(+), 15 deletions(-) rename autobuild.sh => prepare-release.sh (64%) -- 2.17.0
The script was originally used by the Test::AutoBuild project to perform periodic automatic builds; however, that effort has been abandoned a long time ago, and these days libvirt-tck CI builds are happening on the Jenkins-based CentOS CI environment under the libvirt umbrella[1], where build recipes are maintained separately from the projects themselves. The script is still used to prepare releases, so it can't be dropped from the repository: rename it so that its purpose is more clearly communicated instead. [1] https://ci.centos.org/view/libvirt/ Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- autobuild.sh => prepare-release.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename autobuild.sh => prepare-release.sh (100%) diff --git a/autobuild.sh b/prepare-release.sh similarity index 100% rename from autobuild.sh rename to prepare-release.sh -- 2.17.0
They are misleading, and no longer relevant anyway. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- prepare-release.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/prepare-release.sh b/prepare-release.sh index 005993d..7282123 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -1,8 +1,5 @@ #!/bin/sh # -# This script is used to Test::AutoBuild (http://www.autobuild.org) -# to perform automated builds of the Sys-Virt module -# # Copyright (C) 2009 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # @@ -21,9 +18,7 @@ set -e rm -rf MANIFEST blib _build Build -test -z "$AUTOBUILD_INSTALL_ROOT" && AUTOBUILD_INSTALL_ROOT=$HOME/builder - -perl Build.PL install_base=$AUTOBUILD_INSTALL_ROOT +perl Build.PL install_base=$HOME/builder ./Build ./Build manifest @@ -47,12 +42,8 @@ rm -f $NAME-*.tar.gz ./Build dist if [ -f /usr/bin/rpmbuild ]; then - if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" - else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" - fi + NOW=`date +"%s"` + EXTRA_RELEASE=".$USER$NOW" rpmbuild -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz fi -- 2.17.0
It was mainly meant to be used for automatic builds through Test::AutoBuild, so it can be removed now. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- perl-Sys-Virt-TCK.spec.PL | 3 +-- prepare-release.sh | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 9694227..aac6cf6 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -32,12 +32,11 @@ __DATA__ %define perlversion %(perl -e 'use Config; print $Config{version}') %define appname Sys-Virt-TCK -%define _extra_release %{?extra_release:%{extra_release}} Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit Name: perl-%{appname} Version: @VERSION@ -Release: 1%{_extra_release} +Release: 1 License: GPLv2 Group: Development/Tools Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz diff --git a/prepare-release.sh b/prepare-release.sh index 7282123..75777a8 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -42,9 +42,7 @@ rm -f $NAME-*.tar.gz ./Build dist if [ -f /usr/bin/rpmbuild ]; then - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" - rpmbuild -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz + rpmbuild -ta --clean $NAME-*.tar.gz fi exit 0 -- 2.17.0
On 05/04/2018 10:14 AM, Andrea Bolognani wrote:
Changes from [v1]:
* rename the script instead of dropping it;
* perform some further clean ups.
[v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00218.html
Andrea Bolognani (3): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to Test::AutoBuild spec: Drop %{extra_release}
perl-Sys-Virt-TCK.spec.PL | 3 +-- autobuild.sh => prepare-release.sh | 15 ++------------- 2 files changed, 3 insertions(+), 15 deletions(-) rename autobuild.sh => prepare-release.sh (64%)
Reviewed-by: Laine Stump <laine@laine.org> (for the series). I'm so glad that you just renamed my cheese instead of removing it :-)
participants (2)
-
Andrea Bolognani -
Laine Stump