On Thu, 2010-03-11 at 15:46 -0500, Darryl L. Pierce wrote: > 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 <[email protected]> > > --- > > 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 > > Looks 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? > > _______________________________________________ > Ovirt-devel mailing list > [email protected] > https://www.redhat.com/mailman/listinfo/ovirt-devel
I'll change find to usr/share/*/*iso and push. I've verified in an autobuild that this works as expected. Mike _______________________________________________ Ovirt-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/ovirt-devel
