Menu
▾
▴
safekeep-commit
|
From: <di...@us...> - 2007-01-25 04:21:05
|
Revision: 289
http://safekeep.svn.sourceforge.net/safekeep/?rev=289&view=rev
Author: dimi
Date: 2007-01-24 20:21:04 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
Fix server namer.
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-01-25 04:09:17 UTC (rev 288)
+++ safekeep/trunk/safekeep-test 2007-01-25 04:21:04 UTC (rev 289)
@@ -278,7 +278,7 @@
'/var/www/repos/lattica/yum/fedora/6/devel/i386',
'/var/www/repos/lattica/yum/centos/4/devel/i386',
]
- packageAndUpload(tmproot, 'Lattica, Inc. (Devel Key) <de...@la...>', repodirs, 'root', 'achilles')
+ packageAndUpload(tmproot, 'Lattica, Inc. (Devel Key) <de...@la...>', repodirs, 'root', 'ulysses')
takeOver(client, 'client')
takeOver(server, 'server')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-01-25 04:57:09
|
Revision: 291
http://safekeep.svn.sourceforge.net/safekeep/?rev=291&view=rev
Author: dimi
Date: 2007-01-24 20:57:07 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
Always nuke yum's cache of our repo, it's changing too fast and causes problems
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-01-25 04:47:26 UTC (rev 290)
+++ safekeep/trunk/safekeep-test 2007-01-25 04:57:07 UTC (rev 291)
@@ -206,7 +206,7 @@
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())
rcmd(cmd, 'root', host, 'install Lattica Repo')
- cmd = 'if rpm -q safekeep; then rm -rf /var/cache/yum/lattica-development/; yum update -y safekeep; else yum install -y safekeep; fi'
+ cmd = 'rm -rf /var/cache/yum/lattica-development/; if rpm -q safekeep; then yum update -y safekeep; else yum install -y safekeep; fi'
rcmd(cmd, 'root', host, 'install safekeep')
def createKey(user, host, keyname, comment):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-01-30 15:25:23
|
Revision: 333
http://safekeep.svn.sourceforge.net/safekeep/?rev=333&view=rev
Author: dimi
Date: 2007-01-30 07:25:22 -0800 (Tue, 30 Jan 2007)
Log Message:
-----------
Instrument the fulltest to deal with the multiple packages
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-01-30 15:01:25 UTC (rev 332)
+++ safekeep/trunk/safekeep-test 2007-01-30 15:25:22 UTC (rev 333)
@@ -206,7 +206,10 @@
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())
rcmd(cmd, 'root', host, 'install Lattica Repo')
- cmd = 'rm -rf /var/cache/yum/lattica-development/; if rpm -q safekeep; then yum update -y safekeep; else yum install -y safekeep; fi'
+ cmd = 'rm -rf /var/cache/yum/lattica-development/; ' + \
+ 'if rpm -q safekeep-%(role)s; ' + \
+ 'then yum update -y safekeep-%(role)s; ' + \
+ 'else yum install -y safekeep-%(role)s; fi' % { 'role': role }
rcmd(cmd, 'root', host, 'install safekeep')
def createKey(user, host, keyname, comment):
@@ -251,22 +254,28 @@
if os.system(cmd):
raise TestFailure('Failed to nuke the tar')
- basename = mytar[0:-len('.tar.gz')]
- binrpm = os.path.join(pkgroot, 'RPMS/noarch', basename + '-1.noarch.rpm')
- if not os.path.isfile(binrpm):
- raise TestFailure('Failed to find binary rpm: %s' % binrpm)
+ ver = mytar[len('safekeep-'):-len('.tar.gz')]
+ binrpm_common = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-common-' + ver + '-1.noarch.rpm')
+ binrpm_client = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-client-' + ver + '-1.noarch.rpm')
+ binrpm_server = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-server-' + ver + '-1.noarch.rpm')
+ for binrpm in (binrpm_common, binrpm_client, binrpm_server):
+ 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), mkarg(binrpm))
+ cmd = 'rpm --define %s --addsign %s %s %s' % \
+ (mkarg('_gpg_name ' + keyname), binrpm_common, binrpm_client, binrpm_server)
print cmd
if os.system(cmd):
raise TestFailure('Failed to sign rpms')
for repodir in repodirs:
- cmd = '%s %s %s@%s:%s' % (mkssh('scp'), mkarg(binrpm), user, host, repodir)
+ cmd = '%s %s %s %s %s@%s:%s' % \
+ (mkssh('scp'), binrpm_common, binrpm_client, binrpm_server, user, host, repodir)
print cmd
if os.system(cmd):
- raise TestFailure('Failed to copy %s to the repository' % binrpm)
+ raise TestFailure('Failed to copy safekee-*-%s-1.noarch.rpm to the repository' % ver)
cmd = 'createrepo %s' % mkarg(repodir)
rcmd(cmd, user, host, 'update repo metadata')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-01-30 15:32:20
|
Revision: 334
http://safekeep.svn.sourceforge.net/safekeep/?rev=334&view=rev
Author: dimi
Date: 2007-01-30 07:32:16 -0800 (Tue, 30 Jan 2007)
Log Message:
-----------
Make sure the version we expect ends up being installed
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-01-30 15:25:22 UTC (rev 333)
+++ safekeep/trunk/safekeep-test 2007-01-30 15:32:16 UTC (rev 334)
@@ -165,7 +165,7 @@
shutil.rmtree(os.path.join(tmproot, 'restore'))
time.sleep(1)
-def takeOver(host, role):
+def takeOver(host, role, verrel):
cmd = 'ssh -o PasswordAuthentication=no root@%s true' % (host)
if os.system(cmd):
print 'The box %s does not appear to have been initialized' % (host)
@@ -207,9 +207,12 @@
cmd = 'echo %s > /etc/yum.repos.d/lattica-development.repo' % (mkarg(lattica_repo).strip())
rcmd(cmd, 'root', host, 'install Lattica Repo')
cmd = 'rm -rf /var/cache/yum/lattica-development/; ' + \
- 'if rpm -q safekeep-%(role)s; ' + \
- 'then yum update -y safekeep-%(role)s; ' + \
- 'else yum install -y safekeep-%(role)s; fi' % { 'role': role }
+ 'if rpm -q safekeep-%(role)s-%(verrel)s; ' + \
+ 'then yum update -y safekeep-%(role)s-%(verrel); ' + \
+ 'else yum install -y safekeep-%(role)s-%(verrel); ' + \
+ 'fi; ' + \
+ 'rpm -q safekeep-%(role)s | grep %(verrel)s' \
+ % { 'role': role, 'verrel': verrel }
rcmd(cmd, 'root', host, 'install safekeep')
def createKey(user, host, keyname, comment):
@@ -278,8 +281,10 @@
raise TestFailure('Failed to copy safekee-*-%s-1.noarch.rpm to the repository' % ver)
cmd = 'createrepo %s' % mkarg(repodir)
- rcmd(cmd, user, host, 'update repo metadata')
+ rcmd(cmd, user, host, 'update repo metadata')
+ return ver + '-1'
+
def remoteTest(tmproot, client, server):
# build, sign and upload the .rpm
repodirs = [
@@ -287,10 +292,10 @@
'/var/www/repos/lattica/yum/fedora/6/devel/i386',
'/var/www/repos/lattica/yum/centos/4/devel/i386',
]
- packageAndUpload(tmproot, 'Lattica, Inc. (Devel Key) <de...@la...>', repodirs, 'root', 'ulysses')
+ verrel = packageAndUpload(tmproot, 'Lattica, Inc. (Devel Key) <de...@la...>', repodirs, 'root', 'ulysses')
- takeOver(client, 'client')
- takeOver(server, 'server')
+ takeOver(client, 'client', verrel)
+ takeOver(server, 'server', verrel)
# setup the server
client_addr = socket.gethostbyname(client)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-01-30 16:27:15
|
Revision: 336
http://safekeep.svn.sourceforge.net/safekeep/?rev=336&view=rev
Author: dimi
Date: 2007-01-30 08:27:04 -0800 (Tue, 30 Jan 2007)
Log Message:
-----------
Fix installation of packages on the test boxes
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-01-30 15:33:46 UTC (rev 335)
+++ safekeep/trunk/safekeep-test 2007-01-30 16:27:04 UTC (rev 336)
@@ -206,13 +206,15 @@
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())
rcmd(cmd, 'root', host, 'install Lattica Repo')
- cmd = 'rm -rf /var/cache/yum/lattica-development/; ' + \
- 'if rpm -q safekeep-%(role)s-%(verrel)s; ' + \
- 'then yum update -y safekeep-%(role)s-%(verrel); ' + \
- 'else yum install -y safekeep-%(role)s-%(verrel); ' + \
- 'fi; ' + \
- 'rpm -q safekeep-%(role)s | grep %(verrel)s' \
- % { 'role': role, 'verrel': verrel }
+ cmd = """
+ rm -rf /var/cache/yum/lattica-development/;
+ if rpm -q safekeep-%(role)s-%(verrel)s; then
+ yum update -y safekeep-%(role)s-%(verrel)s;
+ else
+ yum install -y safekeep-%(role)s-%(verrel)s;
+ fi;
+ rpm -q safekeep-%(role)s | grep %(verrel)s
+ """ % { 'role': role, 'verrel': verrel }
rcmd(cmd, 'root', host, 'install safekeep')
def createKey(user, host, keyname, comment):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-01-30 16:55:21
|
Revision: 337
http://safekeep.svn.sourceforge.net/safekeep/?rev=337&view=rev
Author: dimi
Date: 2007-01-30 08:55:15 -0800 (Tue, 30 Jan 2007)
Log Message:
-----------
Fix string interpolation
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-01-30 16:27:04 UTC (rev 336)
+++ safekeep/trunk/safekeep-test 2007-01-30 16:55:15 UTC (rev 337)
@@ -326,8 +326,7 @@
cmd = 'if test -f %s; then grep -i %s %s; fi' % (known_hosts, client, known_hosts)
fingerprint = rcmdout(cmd, None, None, 'read the client fingerprint')
if fingerprint:
- cmd = '(if test -f .ssh/known_hosts; then grep -iv %s %s .ssh/known_hosts; fi; cat) > .ssh/known_hosts.new; ' + \
- 'mv -f .ssh/known_hosts.new .ssh/known_hosts'
+ cmd = '(if test -f .ssh/known_hosts; then grep -iv %s .ssh/known_hosts; fi; cat) > .ssh/known_hosts.new; mv -f .ssh/known_hosts.new .ssh/known_hosts' % (client, )
rcmdin(cmd, fingerprint, 'backup-op', server, 'deploy client fingerprint on server')
snap_conf = ''
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-01-30 19:21:18
|
Revision: 339
http://safekeep.svn.sourceforge.net/safekeep/?rev=339&view=rev
Author: dimi
Date: 2007-01-30 11:21:11 -0800 (Tue, 30 Jan 2007)
Log Message:
-----------
Make use of the standard safekeep user instead of inventing our own backup-op user.
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-01-30 17:15:19 UTC (rev 338)
+++ safekeep/trunk/safekeep-test 2007-01-30 19:21:11 UTC (rev 339)
@@ -218,8 +218,8 @@
rcmd(cmd, 'root', host, 'install safekeep')
def createKey(user, host, keyname, comment):
- key = '/home/%s/.ssh/%s' % (user, keyname)
- cmd = 'test -f %s || ssh-keygen -q -b 1024 -t dsa -N \'\' -c \'%s\' -f %s' % (key, comment, key)
+ key = '.ssh/%s' % keyname
+ cmd = 'test -f %s || ssh-keygen -q -b 1024 -t dsa -N \'\' -C \'%s\' -f %s' % (key, comment, key)
rcmd(cmd, user, host, 'create %s on server' % keyname)
return key
@@ -300,20 +300,20 @@
takeOver(server, 'server', verrel)
# setup the server
+ cmd = 'chsh -s /bin/bash safekeep'
+ rcmd(cmd, 'root', server, 'Allow access to the safekeep account')
client_addr = socket.gethostbyname(client)
if client_addr != client:
cmd = '(grep -iv %s /etc/hosts; echo "%s %s") > /etc/hosts.new; mv -f /etc/hosts.new /etc/hosts' % (client, client_addr, client)
rcmd(cmd, 'root', server, 'install the client name in /etc/hosts')
- cmd = 'useradd backup-op || true'
- rcmd(cmd, 'root', server, 'create backup-op user')
- cmd = 'cd ~backup-op; umask 077; test -d .ssh || mkdir .ssh; ' + \
+ cmd = 'cd ~safekeep; ' + \
'cp /root/.ssh/authorized_keys .ssh/authorized_keys; ' + \
- 'chown -R backup-op.backup-op .ssh'
- rcmd(cmd, 'root', server, 'install key for backup-op user')
- key_id = createKey('backup-op', server, 'id_dsa', 'SafeKeep server ID')
- key_ctrl = createKey('backup-op', server, 'safekeep-server-ctrl-key', 'SafeKeep server control key')
- key_data = createKey('backup-op', server, 'id-safekeep-data-key', 'SafeKeep server data key')
+ 'chown -R safekeep.safekeep .ssh'
+ rcmd(cmd, 'root', server, 'install key for the safekeep user')
+ key_id = createKey('safekeep', server, 'id_dsa', 'SafeKeep server ID')
+ key_ctrl = createKey('safekeep', server, 'safekeep-server-ctrl-key', 'SafeKeep server control key')
+ key_data = createKey('safekeep', server, 'id-safekeep-data-key', 'SafeKeep server data key')
cmd = 'if ! rpm -q postgresql-server; then p=postgresql-server; fi; ' + \
'if ! rpm -q mysql-server; then p="$p mysql-server"; fi; ' + \
@@ -327,7 +327,7 @@
fingerprint = rcmdout(cmd, None, None, 'read the client fingerprint')
if fingerprint:
cmd = '(if test -f .ssh/known_hosts; then grep -iv %s .ssh/known_hosts; fi; cat) > .ssh/known_hosts.new; mv -f .ssh/known_hosts.new .ssh/known_hosts' % (client, )
- rcmdin(cmd, fingerprint, 'backup-op', server, 'deploy client fingerprint on server')
+ rcmdin(cmd, fingerprint, 'safekeep', server, 'deploy client fingerprint on server')
snap_conf = ''
if perform_snapshots:
@@ -335,7 +335,7 @@
conf = """
<backup id="test-client">
<host name="%s" key-data="%s" />
- <repo path="/home/backup-op/client/data" retention="5h"/>
+ <repo path="/var/lib/safekeep/client/data" retention="5h"/>
<setup>
%s
</setup>
@@ -352,22 +352,22 @@
writefile('/etc/safekeep.d/test-client.conf', conf, '664', 'w', 'root', server)
cmd = 'rm -rf client; mkdir -p client/data'
- rcmd(cmd, 'backup-op', server, 'create data repo')
+ rcmd(cmd, 'safekeep', server, 'create data repo')
# setup the client
cmd = 'umask 077; test -d .ssh || mkdir .ssh; if test -f .ssh/authorized_keys; then cat .ssh/authorized_keys; fi'
clkeys_txt = rcmdout(cmd, 'root', client, 'fetch client keys')
- key_id_enc = readfile('.ssh/id_dsa.pub', 'backup-op', server)
+ key_id_enc = readfile('.ssh/id_dsa.pub', 'safekeep', server)
if key_id_enc not in clkeys_txt.splitlines():
writefile('.ssh/authorized_keys', key_id_enc, None, 'a', 'root', client)
cmd = 'safekeep %s --keys --deploy' % safekeep_args
- rcmd(cmd, 'backup-op', server, 'deploy keys to client')
+ rcmd(cmd, 'safekeep', server, 'deploy keys to client')
# run the test
for i in range(test_reps):
cmd = 'rm -f md5sum.client md5sum.server'
- rcmd(cmd, 'backup-op', server, 'cleanup MD5 sums')
+ rcmd(cmd, 'safekeep', server, 'cleanup MD5 sums')
FILES = (
'/etc/a-simple-file',
'/etc/another-file.nobackup',
@@ -380,14 +380,14 @@
"grep -v '\.nobackup$' | grep -v '^/etc/cups/certs/' | " + \
"grep -v '^/etc/mtab' | grep -v '^/etc/lvm/' | " + \
"sort | sed s/.// | xargs md5sum"
- cmd2 = "cat > /home/backup-op/md5sum.client"
- rpipe(cmd1, 'root', client, 'do MD5 sums on client', cmd2, 'backup-op', server)
+ cmd2 = "cat > /var/lib/safekeep/md5sum.client"
+ rpipe(cmd1, 'root', client, 'do MD5 sums on client', cmd2, 'safekeep', server)
cmd = 'safekeep %s' % safekeep_args
- rcmd(cmd, 'backup-op', server, 'backup data')
- cmd = 'cd /home/backup-op/client/data; find -type f | grep -v rdiff-backup-data/ | sort | sed s/..// | xargs md5sum > /home/backup-op/md5sum.server'
- rcmd(cmd, 'backup-op', server, 'do MD5 sums on server')
- cmd = 'diff -q /home/backup-op/md5sum.client /home/backup-op/md5sum.server'
- rcmd(cmd, 'backup-op', server, 'compare MD5 sums')
+ rcmd(cmd, 'safekeep', server, 'backup data')
+ cmd = 'cd /var/lib/safekeep/client/data; find -type f | grep -v rdiff-backup-data/ | sort | sed s/..// | xargs md5sum > /var/lib/safekeep/md5sum.server'
+ rcmd(cmd, 'safekeep', server, 'do MD5 sums on server')
+ cmd = 'diff -q /var/lib/safekeep/md5sum.client /var/lib/safekeep/md5sum.server'
+ rcmd(cmd, 'safekeep', server, 'compare MD5 sums')
# TODO: list available backups
# TODO: compare against retention policy, fail if different
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-02-02 00:36:56
|
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.
|
|
From: <di...@us...> - 2007-03-07 19:13:42
|
Revision: 440
http://safekeep.svn.sourceforge.net/safekeep/?rev=440&view=rev
Author: dimi
Date: 2007-03-07 11:13:40 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
Fix the local test
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-03-07 19:13:27 UTC (rev 439)
+++ safekeep/trunk/safekeep-test 2007-03-07 19:13:40 UTC (rev 440)
@@ -133,7 +133,7 @@
</data>
</backup>
"""
- writefile(os.path.join(tmproot, 'test.conf'), CONFIG % params)
+ writefile(os.path.join(tmproot, 'test.backup'), CONFIG % params)
for i in xrange(test_reps):
FILES = (
'data/fileA.out',
@@ -149,7 +149,7 @@
cmd = "cd %(tmproot)s/client; find -type f -a \! -name '*.nobackup' | sort | xargs md5sum > %(tmproot)s/md5sums.client"
if os.system(cmd % params):
raise TestFailure("Can't compute the source MD5 sums")
- cmd = "safekeep %(args)s --conf '%(tmproot)s/test.conf'"
+ cmd = "safekeep %(args)s --conf '%(tmproot)s/test.backup'"
if os.system(cmd % params):
raise TestFailure("Can't backup files")
os.mkdir(os.path.join(tmproot, 'restore'))
@@ -350,7 +350,7 @@
</backup>
""" % (client, key_data, snap_conf)
- writefile('/etc/safekeep.d/test-client.conf', conf, '664', 'w', 'root', server)
+ writefile('/etc/safekeep/clients.d/test-client.backup', conf, '664', 'w', 'root', server)
cmd = 'rm -rf client; mkdir -p client/data'
rcmd(cmd, 'safekeep', server, 'create data repo')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-08 21:46:07
|
Revision: 448
http://safekeep.svn.sourceforge.net/safekeep/?rev=448&view=rev
Author: dimi
Date: 2007-03-08 13:46:05 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
Make use of the new config files to avoid the deprecation warning in tests
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-03-08 20:56:12 UTC (rev 447)
+++ safekeep/trunk/safekeep-test 2007-03-08 21:46:05 UTC (rev 448)
@@ -119,12 +119,17 @@
def localTest(tmproot):
params = {'tmproot': tmproot, 'args': safekeep_args}
+ os.mkdir(os.path.join(tmproot, 'clients.d'))
os.mkdir(os.path.join(tmproot, 'client'))
os.mkdir(os.path.join(tmproot, 'client', 'data'))
os.mkdir(os.path.join(tmproot, 'client', 'home'))
os.mkdir(os.path.join(tmproot, 'client', 'misc'))
os.mkdir(os.path.join(tmproot, 'server'))
CONFIG = """
+ # Default values should do for now
+ """
+ writefile(os.path.join(tmproot, 'safekeep.conf'), CONFIG % params)
+ BACKUP = """
<backup id="%(tmproot)s">
<repo path="%(tmproot)s/server" />
<data>
@@ -133,7 +138,7 @@
</data>
</backup>
"""
- writefile(os.path.join(tmproot, 'test.backup'), CONFIG % params)
+ writefile(os.path.join(tmproot, 'clients.d', 'test.backup'), BACKUP % params)
for i in xrange(test_reps):
FILES = (
'data/fileA.out',
@@ -149,7 +154,7 @@
cmd = "cd %(tmproot)s/client; find -type f -a \! -name '*.nobackup' | sort | xargs md5sum > %(tmproot)s/md5sums.client"
if os.system(cmd % params):
raise TestFailure("Can't compute the source MD5 sums")
- cmd = "safekeep %(args)s --conf '%(tmproot)s/test.backup'"
+ cmd = "safekeep %(args)s --conf '%(tmproot)s/safekeep.conf'"
if os.system(cmd % params):
raise TestFailure("Can't backup files")
os.mkdir(os.path.join(tmproot, 'restore'))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-13 05:22:50
|
Revision: 461
http://safekeep.svn.sourceforge.net/safekeep/?rev=461&view=rev
Author: dimi
Date: 2007-03-12 22:22:34 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Run the --server and --key mode as root to test the new user-changing functionality
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-03-13 05:20:24 UTC (rev 460)
+++ safekeep/trunk/safekeep-test 2007-03-13 05:22:34 UTC (rev 461)
@@ -367,7 +367,7 @@
writefile('.ssh/authorized_keys', key_id_enc, None, 'a', 'root', client)
cmd = 'safekeep %s --keys --deploy' % safekeep_args
- rcmd(cmd, 'safekeep', server, 'deploy keys to client')
+ rcmd(cmd, 'root', server, 'deploy keys to client')
# run the test
for i in range(test_reps):
@@ -387,8 +387,8 @@
"sort | sed s/.// | xargs md5sum"
cmd2 = "cat > /var/lib/safekeep/md5sum.client"
rpipe(cmd1, 'root', client, 'do MD5 sums on client', cmd2, 'safekeep', server)
- cmd = 'safekeep %s' % safekeep_args
- rcmd(cmd, 'safekeep', server, 'backup data')
+ cmd = 'safekeep --server %s' % safekeep_args
+ rcmd(cmd, 'root', server, 'backup data')
cmd = 'cd /var/lib/safekeep/client/data; find -type f | grep -v rdiff-backup-data/ | sort | sed s/..// | xargs md5sum > /var/lib/safekeep/md5sum.server'
rcmd(cmd, 'safekeep', server, 'do MD5 sums on server')
cmd = 'diff -q /var/lib/safekeep/md5sum.client /var/lib/safekeep/md5sum.server'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-13 06:25:38
|
Revision: 464
http://safekeep.svn.sourceforge.net/safekeep/?rev=464&view=rev
Author: dimi
Date: 2007-03-12 23:25:36 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Use the safekeep user for key deployment for now, it is messy otherwise
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-03-13 05:52:48 UTC (rev 463)
+++ safekeep/trunk/safekeep-test 2007-03-13 06:25:36 UTC (rev 464)
@@ -367,7 +367,7 @@
writefile('.ssh/authorized_keys', key_id_enc, None, 'a', 'root', client)
cmd = 'safekeep %s --keys --deploy' % safekeep_args
- rcmd(cmd, 'root', server, 'deploy keys to client')
+ rcmd(cmd, 'safekeep', server, 'deploy keys to client')
# run the test
for i in range(test_reps):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-06-11 00:41:13
|
Revision: 525
http://safekeep.svn.sourceforge.net/safekeep/?rev=525&view=rev
Author: dimi
Date: 2007-06-10 17:41:12 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Remove support for Fedora Core 5, add support for Fedora 7 and CentOS 5
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-06-10 23:02:54 UTC (rev 524)
+++ safekeep/trunk/safekeep-test 2007-06-11 00:41:12 UTC (rev 525)
@@ -293,9 +293,10 @@
def remoteTest(tmproot, client, server):
# build, sign and upload the .rpm
repodirs = [
- '/var/www/repos/lattica/devel/fedora/5',
'/var/www/repos/lattica/devel/fedora/6',
+ '/var/www/repos/lattica/devel/fedora/7',
'/var/www/repos/lattica/devel/centos/4',
+ '/var/www/repos/lattica/devel/centos/5',
]
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.
|
|
From: <di...@us...> - 2007-06-11 04:00:20
|
Revision: 526
http://safekeep.svn.sourceforge.net/safekeep/?rev=526&view=rev
Author: dimi
Date: 2007-06-10 21:00:18 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Add automatic release detection, for proper Fedora 7 support.
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-06-11 00:41:12 UTC (rev 525)
+++ safekeep/trunk/safekeep-test 2007-06-11 04:00:18 UTC (rev 526)
@@ -265,8 +265,12 @@
raise TestFailure('Failed to nuke the tar')
ver = mytar[len('safekeep-'):-len('.tar.gz')]
- binrpm_list = glob.glob(os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-*-' + ver + '-1*.noarch.rpm'))
+ binrpm_list = glob.glob(os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-*-' + ver + '-*.noarch.rpm'))
+ rel = binrpm_list[0]
+ rel = rel[rel.rindex('-')+1:rel.rindex('.')]
+ rel = rel[:rel.rindex('.')]
+
for binrpm in binrpm_list:
if not os.path.isfile(binrpm):
raise TestFailure('Failed to find binary rpm: %s' % binrpm)
@@ -283,12 +287,12 @@
(mkssh('scp'), ' '.join(binrpm_list), user, host, repodir)
print cmd
if os.system(cmd):
- raise TestFailure('Failed to copy safekee-*-%s-1.noarch.rpm to the repository' % ver)
+ raise TestFailure('Failed to copy safekee-*-%s-%s.noarch.rpm to the repository' % (ver, rel))
cmd = 'createrepo %s' % mkarg(repodir)
rcmd(cmd, user, host, 'update repo metadata')
- return ver + '-1'
+ return ver + '-' + rel
def remoteTest(tmproot, client, server):
# build, sign and upload the .rpm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-11-07 14:39:28
|
Revision: 566
http://safekeep.svn.sourceforge.net/safekeep/?rev=566&view=rev
Author: dimi
Date: 2007-11-07 06:39:26 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Update test to be explicit with the mode
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-11-07 14:39:07 UTC (rev 565)
+++ safekeep/trunk/safekeep-test 2007-11-07 14:39:26 UTC (rev 566)
@@ -154,7 +154,7 @@
cmd = "cd %(tmproot)s/client; find -type f -a \! -name '*.nobackup' | sort | xargs md5sum > %(tmproot)s/md5sums.client"
if os.system(cmd % params):
raise TestFailure("Can't compute the source MD5 sums")
- cmd = "safekeep %(args)s --conf '%(tmproot)s/safekeep.conf'"
+ cmd = "safekeep --server %(args)s --conf '%(tmproot)s/safekeep.conf'"
if os.system(cmd % params):
raise TestFailure("Can't backup files")
os.mkdir(os.path.join(tmproot, 'restore'))
@@ -308,7 +308,7 @@
takeOver(server, 'server', verrel)
# setup the server
- cmd = 'chsh -s /bin/bash safekeep'
+ cmd = 'chsh -s /bin/bash safekeep --server'
rcmd(cmd, 'root', server, 'Allow access to the safekeep account')
client_addr = socket.gethostbyname(client)
if client_addr != client:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X