SF.net SVN: safekeep: [356] safekeep/trunk/safekeep-test

[<di...@us...>]

Revision: 356
          http://safekeep.svn.sourceforge.net/safekeep/?rev=356&view=rev
Author:   dimi
Date:     2007-02-01 16:36:52 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
Adjust test to match the new structure used by the repos

Modified Paths:
--------------
    safekeep/trunk/safekeep-test

Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test	2007-02-02 00:06:18 UTC (rev 355)
+++ safekeep/trunk/safekeep-test	2007-02-02 00:36:52 UTC (rev 356)
@@ -196,18 +196,18 @@
         raise TestFailure('Unknown distro %s in release %s' % (distro, release))
 
     lattica_repo = """
-        [lattica-development]
-        name=Lattica - Development Tree  for Fedora Core $releasever $basearch
-        baseurl=http://lattica.com/repos/lattica/yum/%s/$releasever/devel/$basearch
+        [safekeep-test-lattica-devel]
+        name=Lattica - Development Tree for Fedora Core $releasever $basearch
+        baseurl=http://lattica.com/repos/lattica/devel/%s/$releasever
         gpgkey=http://lattica.com/keys/RPM-GPG-KEY-lattica-devel
         enabled=1
         gpgcheck=%s
     """ % (distro, sign_packages)
     lattica_repo = '\n'.join([line.strip() for line in lattica_repo.splitlines()])
-    cmd = 'echo %s > /etc/yum.repos.d/lattica-development.repo' % (mkarg(lattica_repo).strip())
+    cmd = 'echo %s > /etc/yum.repos.d/safekeep-test-lattica-devel.repo' % (mkarg(lattica_repo).strip())
     rcmd(cmd, 'root', host, 'install Lattica Repo')
     cmd = """
-        rm -rf /var/cache/yum/lattica-development/; 
+        rm -rf /var/cache/yum/safekeep-test-lattica-devel/; 
         if rpm -q safekeep-%(role)s-%(verrel)s; then 
             yum update -y safekeep-%(role)s-%(verrel)s; 
         else 
@@ -276,7 +276,7 @@
             raise TestFailure('Failed to sign rpms')
 
     for repodir in repodirs:
-        cmd = '%s %s %s %s %s@%s:%s' % \
+        cmd = '%s %s %s %s %s@%s:%s/noarch' % \
               (mkssh('scp'), binrpm_common, binrpm_client, binrpm_server, user, host, repodir)
         print cmd
         if os.system(cmd):
@@ -290,9 +290,9 @@
 def remoteTest(tmproot, client, server):
     # build, sign and upload the .rpm
     repodirs = [
-        '/var/www/repos/lattica/yum/fedora/5/devel/i386',
-        '/var/www/repos/lattica/yum/fedora/6/devel/i386',
-        '/var/www/repos/lattica/yum/centos/4/devel/i386',
+        '/var/www/repos/lattica/devel/fedora/5',
+        '/var/www/repos/lattica/devel/fedora/6',
+        '/var/www/repos/lattica/devel/centos/4',
     ]
     verrel = packageAndUpload(tmproot, 'Lattica, Inc. (Devel Key) <de...@la...>', repodirs, 'root', 'ulysses')
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.