[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at b2c5b50101a04436d3d33067862db96d8485303c

[Adrian Likins]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  b2c5b50101a04436d3d33067862db96d8485303c (commit)
       via  b7e270c61a676d3a36013348c5d13f26ca43dc19 (commit)
      from  1616d7f6949e8ee8f39c4999a4d6d608a45fa7a0 (commit)

- Log -----------------------------------------------------------------
commit b2c5b50101a04436d3d33067862db96d8485303c
Merge: b7e270c... 1616d7f...
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Wed Apr 25 16:41:54 2007 -0400

    Merge with git+ssh://g-alikins@et.redhat.com/git/virt-factory

commit b7e270c61a676d3a36013348c5d13f26ca43dc19
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Wed Apr 25 16:38:34 2007 -0400

    cleanup some arch/release stuff so this builds on a x86_64 box
    
    misc fixes
-----------------------------------------------------------------------

Diffstat:
 build/sync-it-all.py |    4 ++--
 build/test-it-all.sh |   18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/sync-it-all.py b/build/sync-it-all.py
index dd3b848..5566dfd 100755
--- a/build/sync-it-all.py
+++ b/build/sync-it-all.py
@@ -31,7 +31,7 @@ LOCALPATH="./"
 
 
 def create_repo_d_file(repo, hostname, urlpath, release):
-    repo_txt = repo_template % {'repo_name':"test_repo_%s" % repo,
+    repo_txt = repo_template % {'repo_name':"vf_test_repo" % repo,
                                 'repo_long_name': "Test Repo for %s" % release,
                                 'base_url': "http://%s/%s/repo/fc$releasever/%s/$basearch/" % (hostname, urlpath, release),                                
                                 'enabled': "1"}
@@ -44,7 +44,7 @@ def create_repo_d_file(repo, hostname, urlpath, release):
     if not os.access("repos.d", os.W_OK):
         os.mkdir("repos.d")
         
-    f = open("repos.d/test_repo_%s.repo" % repo, "w+")
+    f = open("repos.d/vf_test.repo", "w+")
     f.write(repo_txt)
     f.close()
 
diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index b4dc9e6..657a0a5 100644
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -258,6 +258,11 @@ register_system()
 }
 
 
+get_fedora_release()
+{
+    FEDORA_RELEASE=`rpm -q --queryformat "%{VERSION}\n" fedora-release`
+}
+
 web_login()
 {
     echo "logging into login page of $VF_SERVER"
@@ -355,24 +360,23 @@ if [ "$REBUILD" == "Y" ] ; then
     fi
     
     
-    msg "Rebuilding everything for kicks in " 
+    msg "Rebuilding everything for kicks in $BUILD_PATH" 
 
     $BUILD_PATH/virt-factory/build/build-it-all.sh
     
     popd
 
-    # note, we also need to build cobbler and koan, and 
-    # add them to the repo. Do we want to do this as part of
-    # build-it-all.sh? probably
-
 fi
  
 # this syncs the repos to the server, and generates the yum repo.d config files
 if [ "$SYNC_REPOS" == "Y" ] ; then
 	msg "syncing repos"
 	msg "calling sync-it-all.sh with user $REMOTE_USER"
-	echo "$BUILD_PATH/virt-factory/build/sync-it-all.py --localpath $BUILD_PATH/virt-factory/build --user $REMOTE_USER --hostname $REMOTE_HOST --path $REMOTE_PATH --release "devel" --distro "fc6" --urlpath $URL_PATH"
-	$BUILD_PATH/virt-factory/build/sync-it-all.py --localpath $BUILD_PATH/virt-factory/build --user $REMOTE_USER --hostname $REMOTE_HOST --path $REMOTE_PATH --release "devel" --distro "fc6" --urlpath $URL_PATH
+	BUILD_ARCH=`uname -p`
+	get_fedora_release
+	BUILD_RELEASE=$FEDORA_RELEASE
+	echo "$BUILD_PATH/virt-factory/build/sync-it-all.py --localpath $BUILD_PATH/virt-factory/build --user $REMOTE_USER --hostname $REMOTE_HOST --path $REMOTE_PATH --release devel --distro fc$FEDORA_RELEASE --arch $BUILD_ARCH --urlpath $URL_PATH"
+	$BUILD_PATH/virt-factory/build/sync-it-all.py --localpath $BUILD_PATH/virt-factory/build --user $REMOTE_USER --hostname $REMOTE_HOST --path $REMOTE_PATH --release "devel" --distro "fc$FEDORA_RELEASE" --arch "$BUILD_ARCH" --urlpath $URL_PATH
 
 fi
 

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  1616d7f6949e8ee8f39c4999a4d6d608a45fa7a0 \
  b2c5b50101a04436d3d33067862db96d8485303c