Menu
▾
▴
safekeep-commit
|
From: <di...@us...> - 2010-11-19 18:46:17
|
Revision: 700
http://safekeep.svn.sourceforge.net/safekeep/?rev=700&view=rev
Author: dimi
Date: 2010-11-19 18:46:12 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
Somehow newer rdiff-backups removes all write permission
on some of the directories, and shutil.rmtree() cannot
deal with that correctly.
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2010-11-19 17:58:31 UTC (rev 699)
+++ safekeep/trunk/safekeep-test 2010-11-19 18:46:12 UTC (rev 700)
@@ -167,7 +167,9 @@
cmd = "diff -u %(tmproot)s/md5sums.client %(tmproot)s/md5sums.restore"
if os.system(cmd % params):
raise TestFailure("The MD5 sums differ")
- shutil.rmtree(os.path.join(tmproot, 'restore'))
+ dir = os.path.join(tmproot, 'restore')
+ os.system("chmod +w " + dir)
+ shutil.rmtree(dir)
time.sleep(1)
def takeOver(host, role, verrel):
@@ -492,6 +494,7 @@
if nocleanup:
print tmproot
else:
+ os.system("chmod -R +w " +tmproot)
shutil.rmtree(tmproot)
sys.exit(exitcode)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2012-02-14 20:41:46
|
Revision: 806
http://safekeep.svn.sourceforge.net/safekeep/?rev=806&view=rev
Author: dimi
Date: 2012-02-14 20:41:37 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
We no longer need to install the Lattica key
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2012-02-14 20:40:07 UTC (rev 805)
+++ safekeep/trunk/safekeep-test 2012-02-14 20:41:37 UTC (rev 806)
@@ -186,8 +186,6 @@
cmd = 'umask 077; test -d .ssh || mkdir .ssh; cat >> .ssh/authorized_keys'
rcmdin(cmd, ssh_id_file_keys[1], 'root', host)
- cmd = 'rpm --import http://lattica.com/keys/RPM-GPG-KEY-lattica-devel'
- rcmd(cmd, 'root', host, 'install Lattica Devel Key')
cmd = 'cat /etc/redhat-release'
release = rcmdout(cmd, 'root', host, 'fetch the release')
res = re.match('\s*(.*) release (.*) \(.*\)\s*', release)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2012-02-14 20:43:23
|
Revision: 807
http://safekeep.svn.sourceforge.net/safekeep/?rev=807&view=rev
Author: dimi
Date: 2012-02-14 20:43:17 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Remove unused parameter
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2012-02-14 20:41:37 UTC (rev 806)
+++ safekeep/trunk/safekeep-test 2012-02-14 20:43:17 UTC (rev 807)
@@ -227,7 +227,7 @@
rcmd(cmd, user, host, 'create %s on server' % keyname)
return key
-def packageAndUpload(pkgroot, keyname, repodirs, user, host):
+def packageAndUpload(pkgroot, repodirs, user, host):
rpmmacros = """
%%packager safekeep Tester Package Builder
%%_topdir %s
@@ -294,7 +294,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')
+ verrel = packageAndUpload(tmproot, repodirs, 'root', 'ulysses')
takeOver(client, 'client', verrel)
takeOver(server, 'server', verrel)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2012-02-14 21:12:16
|
Revision: 808
http://safekeep.svn.sourceforge.net/safekeep/?rev=808&view=rev
Author: dimi
Date: 2012-02-14 21:12:10 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Separate out the building of the RPM (WIP).
Give up going through the YUM repos.
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2012-02-14 20:43:17 UTC (rev 807)
+++ safekeep/trunk/safekeep-test 2012-02-14 21:12:10 UTC (rev 808)
@@ -227,7 +227,11 @@
rcmd(cmd, user, host, 'create %s on server' % keyname)
return key
-def packageAndUpload(pkgroot, repodirs, user, host):
+#TODO: this is just old code, we need to change it
+# so that it builds the RPM on the host it will run on
+def packageRPM(tar, user, host):
+ pkgroot='/tmp/safekeep-test-XXX' #TODO: replace XXX with curr timestamp
+
rpmmacros = """
%%packager safekeep Tester Package Builder
%%_topdir %s
@@ -235,34 +239,24 @@
%%_signature gpg
""" % (pkgroot)
+
writefile(os.path.join(pkgroot, '.rpmmacros'), rpmmacros)
# and the directories needed by rpmbuild
for dir in ('BUILD', 'RPMS/noarch', 'SOURCES', 'SPECS', 'SRPMS'):
os.makedirs(os.path.join(pkgroot, dir))
- cmd = 'make tar'
+ cmd = '%s %s %s@%s:%s' % \
+ (mkssh('scp'), tar, user, host, pkgroot)
+ print cmd
if os.system(cmd):
- raise TestFailure('Failed to build the tar snapshot')
- files = os.listdir('.')
- mytar = None
- for file in files:
- if file.startswith('safekeep-') and file.endswith('.tar.gz'):
- if file > mytar:
- mytar = file # last one wins
- if not mytar:
- raise TestFailure('Failed to determine the tar name')
+ raise TestFailure('Failed to copy %s to the RPM host %s' % (tar, host))
cmd = 'HOME=%s rpmbuild -ta %s' % (pkgroot, mytar)
print cmd
if os.system(cmd):
raise TestFailure('Failed to build the .rpm')
- cmd = 'rm %s' % (mytar)
- print cmd
- if os.system(cmd):
- 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 + '-*.noarch.rpm'))
@@ -274,27 +268,32 @@
if not os.path.isfile(binrpm):
raise TestFailure('Failed to find binary rpm: %s' % binrpm)
- for repodir in repodirs:
- cmd = '%s %s %s@%s:%s/noarch' % \
- (mkssh('scp'), ' '.join(binrpm_list), user, host, repodir)
- print cmd
- if os.system(cmd):
- 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')
+def packageAndUpload(user, rpmhost):
+ cmd = 'make tar'
+ if os.system(cmd):
+ raise TestFailure('Failed to build the tar snapshot')
+ files = os.listdir('.')
+ mytar = None
+ for file in files:
+ if file.startswith('safekeep-') and file.endswith('.tar.gz'):
+ if file > mytar:
+ mytar = file # last one wins
+ if not mytar:
+ raise TestFailure('Failed to determine the tar name')
+ if rpmhost:
+ pacakgeRPM(mytar, user, rpmhost)
+
+ cmd = 'rm %s' % (mytar)
+ print cmd
+ if os.system(cmd):
+ raise TestFailure('Failed to nuke the tar')
+
return ver + '-' + rel
def remoteTest(tmproot, client, server):
- # build and upload the .rpm
- repodirs = [
- '/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, repodirs, 'root', 'ulysses')
+ # build and upload
+ verrel = packageAndUpload('root', 'ulysses')
takeOver(client, 'client', verrel)
takeOver(server, 'server', verrel)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2012-02-14 21:15:24
|
Revision: 809
http://safekeep.svn.sourceforge.net/safekeep/?rev=809&view=rev
Author: dimi
Date: 2012-02-14 21:15:18 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Setup the generic skeleton
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2012-02-14 21:12:10 UTC (rev 808)
+++ safekeep/trunk/safekeep-test 2012-02-14 21:15:18 UTC (rev 809)
@@ -229,7 +229,7 @@
#TODO: this is just old code, we need to change it
# so that it builds the RPM on the host it will run on
-def packageRPM(tar, user, host):
+def packageAndDeployRPM(tar, user, host):
pkgroot='/tmp/safekeep-test-XXX' #TODO: replace XXX with curr timestamp
rpmmacros = """
@@ -268,7 +268,11 @@
if not os.path.isfile(binrpm):
raise TestFailure('Failed to find binary rpm: %s' % binrpm)
-def packageAndUpload(user, rpmhost):
+def packageAndDeployDEB(tar, user, host):
+ # TODO: we need to implement this
+ pass
+
+def packageAndUpload(user, rpmhost, debhost):
cmd = 'make tar'
if os.system(cmd):
raise TestFailure('Failed to build the tar snapshot')
@@ -282,8 +286,11 @@
raise TestFailure('Failed to determine the tar name')
if rpmhost:
- pacakgeRPM(mytar, user, rpmhost)
+ pacakgeAndDeployRPM(mytar, user, rpmhost)
+ if debhost:
+ packageAndDeployDEB(mytar, user, debhost)
+
cmd = 'rm %s' % (mytar)
print cmd
if os.system(cmd):
@@ -293,7 +300,7 @@
def remoteTest(tmproot, client, server):
# build and upload
- verrel = packageAndUpload('root', 'ulysses')
+ verrel = packageAndUpload('root', 'ulysses', None)
takeOver(client, 'client', verrel)
takeOver(server, 'server', verrel)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2012-02-14 21:17:56
|
Revision: 810
http://safekeep.svn.sourceforge.net/safekeep/?rev=810&view=rev
Author: dimi
Date: 2012-02-14 21:17:50 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Release is too rpm specific, we can hardcoded
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2012-02-14 21:15:18 UTC (rev 809)
+++ safekeep/trunk/safekeep-test 2012-02-14 21:17:50 UTC (rev 810)
@@ -171,7 +171,7 @@
shutil.rmtree(dir)
time.sleep(1)
-def takeOver(host, role, verrel):
+def takeOver(host, role, ver):
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)
@@ -218,7 +218,7 @@
yum install -y safekeep-%(role)s-%(verrel)s;
fi;
rpm -q safekeep-%(role)s | grep %(verrel)s
- """ % { 'role': role, 'verrel': verrel }
+ """ % { 'role': role, 'verrel': ver + '-1' }
rcmd(cmd, 'root', host, 'install safekeep')
def createKey(user, host, keyname, comment):
@@ -296,14 +296,14 @@
if os.system(cmd):
raise TestFailure('Failed to nuke the tar')
- return ver + '-' + rel
+ return ver
def remoteTest(tmproot, client, server):
# build and upload
- verrel = packageAndUpload('root', 'ulysses', None)
+ ver = packageAndUpload('root', 'ulysses', None)
- takeOver(client, 'client', verrel)
- takeOver(server, 'server', verrel)
+ takeOver(client, 'client', ver)
+ takeOver(server, 'server', ver)
# setup the server
cmd = 'chsh -s /bin/bash safekeep --server'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2012-02-14 21:18:47
|
Revision: 811
http://safekeep.svn.sourceforge.net/safekeep/?rev=811&view=rev
Author: dimi
Date: 2012-02-14 21:18:37 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Extract the version
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2012-02-14 21:17:50 UTC (rev 810)
+++ safekeep/trunk/safekeep-test 2012-02-14 21:18:37 UTC (rev 811)
@@ -296,6 +296,7 @@
if os.system(cmd):
raise TestFailure('Failed to nuke the tar')
+ ver = mytar[len('safekeep-'):-len('.tar.gz')]
return ver
def remoteTest(tmproot, client, server):
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