Mike Burns
2010-Mar-30 15:21 UTC
[Ovirt-devel] [PATCH node] Default OVIRT_CACHE_DIR to be in root autobuild directory
Previously was not getting set to anything resulting in cache
being stored in ~/ovirt-cache. For systems where multiple autobuilds
are running, this can lead to issues with builds for one version
getting rpms generated by another version.
Signed-off-by: Mike Burns <mburns at redhat.com>
---
autobuild.sh | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/autobuild.sh b/autobuild.sh
index f2b581d..b3c7f82 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -25,6 +25,8 @@ set -v
test -f Makefile && make -k distclean || :
+OVIRT_CACHE_DIR=${AUTOBUILD_SOURCE_ROOT}/..
+
./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT
make
make install
--
1.6.6.1
Mike Burns
2010-Mar-30 16:20 UTC
[Ovirt-devel] [PATCH node] Default OVIRT_CACHE_DIR to be in root autobuild directory
Please disregard, testing highlighted other issues. I'll post another patch shortly Mike On Tue, 2010-03-30 at 11:21 -0400, Mike Burns wrote:> Previously was not getting set to anything resulting in cache > being stored in ~/ovirt-cache. For systems where multiple autobuilds > are running, this can lead to issues with builds for one version > getting rpms generated by another version. > > Signed-off-by: Mike Burns <mburns at redhat.com> > --- > autobuild.sh | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/autobuild.sh b/autobuild.sh > index f2b581d..b3c7f82 100755 > --- a/autobuild.sh > +++ b/autobuild.sh > @@ -25,6 +25,8 @@ set -v > > test -f Makefile && make -k distclean || : > > +OVIRT_CACHE_DIR=${AUTOBUILD_SOURCE_ROOT}/.. > + > ./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT > make > make install
Mike Burns
2010-Mar-30 16:23 UTC
[Ovirt-devel] [PATCH node] Default OVIRT_CACHE_DIR to be in root autobuild directory
Previously was not getting set to anything resulting in cache
being stored in ~/ovirt-cache. For systems where multiple autobuilds
are running, this can lead to issues with builds for one version
getting rpms generated by another version.
Also, set ovirt-local repo to pull from the autobuild package root.
Signed-off-by: Mike Burns <mburns at redhat.com>
---
autobuild.sh | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/autobuild.sh b/autobuild.sh
index f2b581d..92b3d32 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -25,6 +25,9 @@ set -v
test -f Makefile && make -k distclean || :
+OVIRT_CACHE_DIR=${AUTOBUILD_SOURCE_ROOT}/../ovirt-cache
+OVIRT_LOCAL_REPO=file://${AUTOBUILD_PACKAGE_ROOT}/rpm/RPMS
+
./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT
make
make install
@@ -44,7 +47,10 @@ fi
#make iso
cd recipe
-make ovirt-node-image.iso
+make \
+ OVIRT_LOCAL_REPO=$OVIRT_LOCAL_REPO \
+ OVIRT_CACHE_DIR=$OVIRT_CACHE_DIR \
+ovirt-node-image.iso
#copy iso back to main directory for autotest.sh
cp *iso ..
--
1.6.6.1