SF.net SVN: safekeep:[804] safekeep/trunk

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

Revision: 804
          http://safekeep.svn.sourceforge.net/safekeep/?rev=804&view=rev
Author:   dimi
Date:     2012-02-14 20:38:19 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Get rid of the package signing, it's not the proper place here.
This complicates the test unnecessarily, making it more likely
that it will bitrot.

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

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2012-02-11 10:14:31 UTC (rev 803)
+++ safekeep/trunk/safekeep	2012-02-14 20:38:19 UTC (rev 804)
@@ -474,6 +474,9 @@
                          '/var/named/chroot/dev', '/var/named/chroot/proc', 
                          '/var/named/chroot/var/run', '/var/named/chroot/var/tmp' ]
         cludes = [{ 'type' : 'exclude', 'path' : path, 'glob' : None, 'regexp' : None } for path in path_xcludes]
+    
+    for dump in dumps:
+        cludes.insert(0, { 'type' : 'include', 'path' : dump['file'], 'glob' : None, 'regexp' : None })
 
     return { 'id': cfg_id, 'host' : host, 'port' : port, 'nice' : nice, 'user' : user, 'key_ctrl' : key_ctrl, 'key_data' : key_data,
              'dir' : repo_dir, 'retention' : retention, 'dumps' : dumps, 'snaps' : snaps, 'script' : script,

Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test	2012-02-11 10:14:31 UTC (rev 803)
+++ safekeep/trunk/safekeep-test	2012-02-14 20:38:19 UTC (rev 804)
@@ -5,7 +5,6 @@
 from commands import mkarg
 
 ssh_id_file_keys = None
-sign_packages = 0
 perform_snapshots = True
 safekeep_args = ''
 test_reps=2
@@ -208,8 +207,8 @@
         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)
+        gpgcheck=0
+    """ % (distro)
     lattica_repo = '\n'.join([line.strip() for line in lattica_repo.splitlines()])
     cmd = 'echo %s > /etc/yum.repos.d/safekeep-test-lattica-devel.repo' % (mkarg(lattica_repo).strip())
     rcmd(cmd, 'root', host, 'install Lattica Repo')
@@ -277,13 +276,6 @@
         if not os.path.isfile(binrpm):
             raise TestFailure('Failed to find binary rpm: %s' % binrpm)
 
-    if sign_packages:   
-        cmd = 'rpm --define %s --addsign %s' % \
-              (mkarg('_gpg_name ' + keyname), ' '.join(binrpm_list))
-        print cmd
-        if os.system(cmd):
-            raise TestFailure('Failed to sign rpms')
-
     for repodir in repodirs:
         cmd = '%s %s %s@%s:%s/noarch' % \
               (mkssh('scp'), ' '.join(binrpm_list), user, host, repodir)
@@ -297,7 +289,7 @@
     return ver + '-' + rel
 
 def remoteTest(tmproot, client, server):
-    # build, sign and upload the .rpm
+    # build and upload the .rpm
     repodirs = [
         '/var/www/repos/lattica/devel/fedora/6',
         '/var/www/repos/lattica/devel/fedora/7',

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