Mike Burns
2010-Mar-11 20:22 UTC
[Ovirt-devel] [PATCH node-image] store iso in build directory after autobuild
The iso is needed in the build directory for autotest.sh to work when running as part of autobuild. This enhances autobuild.sh to copy it over after the rpms are built. Signed-off-by: Mike Burns <mburns at redhat.com> --- autobuild.sh | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index fb9de92..aeee7dd 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -42,3 +42,16 @@ if [ -f /usr/bin/rpmbuild ]; then --define "ovirt_local_repo file://$AUTOBUILD_PACKAGE_ROOT/rpm/RPMS" \ -ta --clean *.tar.gz fi + +#Copy iso image back here for autotest + +#get image rpm +RPM=$(ls -t ${AUTOBUILD_PACKAGE_ROOT}/rpm/RPMS/x86_64/ovirt-node-image-[0-9]*x86_64.rpm | head -n1) + +TEMPDIR=$(mktemp -d -p .) +cp $RPM $TEMPDIR +cd $TEMPDIR +rpm2cpio *rpm | pax -r +cp $(find . -name "*iso") ${AUTOBUILD_SOURCE_ROOT}/${AUTOBUILD_MODULE} +cd ${AUTOBUILD_SOURCE_ROOT}/${AUTOBUILD_MODULE} +rm -rf $TEMPDIR -- 1.6.6.1
Darryl L. Pierce
2010-Mar-11 20:46 UTC
[Ovirt-devel] [PATCH node-image] store iso in build directory after autobuild
On Thu, Mar 11, 2010 at 03:22:38PM -0500, Mike Burns wrote:> The iso is needed in the build directory for autotest.sh to work > when running as part of autobuild. This enhances autobuild.sh to > copy it over after the rpms are built. > > Signed-off-by: Mike Burns <mburns at redhat.com> > --- > autobuild.sh | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/autobuild.sh b/autobuild.sh > index fb9de92..aeee7dd 100755 > --- a/autobuild.sh > +++ b/autobuild.sh > @@ -42,3 +42,16 @@ if [ -f /usr/bin/rpmbuild ]; then > --define "ovirt_local_repo file://$AUTOBUILD_PACKAGE_ROOT/rpm/RPMS" \ > -ta --clean *.tar.gz > fi > + > +#Copy iso image back here for autotest > + > +#get image rpm > +RPM=$(ls -t ${AUTOBUILD_PACKAGE_ROOT}/rpm/RPMS/x86_64/ovirt-node-image-[0-9]*x86_64.rpm | head -n1) > + > +TEMPDIR=$(mktemp -d -p .) > +cp $RPM $TEMPDIR > +cd $TEMPDIR > +rpm2cpio *rpm | pax -r > +cp $(find . -name "*iso") ${AUTOBUILD_SOURCE_ROOT}/${AUTOBUILD_MODULE} > +cd ${AUTOBUILD_SOURCE_ROOT}/${AUTOBUILD_MODULE} > +rm -rf $TEMPDIR > -- > 1.6.6.1Looks logical to me. Though shouldn't the test explicity know where, within the temp directory, the ISO is located, rather than using find to locate it? -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20100311/08d7a590/attachment.sig>
Possibly Parallel Threads
- [PATCH node] Default OVIRT_CACHE_DIR to be in root autobuild directory
- help.... Ovirt node-imge build error
- oVirt Appliance / Single Machine Install
- [PATCH] Moves building ovirt-node-image.iso into the ovirt-node repo.
- [PATCH node] Fix defaulting of OVIRT_CACHE_DIR in recipe makefile