Post-upload tweaks to support RC builds.
This commit is contained in:
parent
a28832b029
commit
3c0683185f
1 changed files with 50 additions and 29 deletions
|
@ -6,19 +6,30 @@ from subprocess import call
|
||||||
suffix = '.dmg'
|
suffix = '.dmg'
|
||||||
if sys.argv[1] == 'windows':
|
if sys.argv[1] == 'windows':
|
||||||
suffix = '.exe'
|
suffix = '.exe'
|
||||||
|
if sys.argv[1] == 'linux':
|
||||||
|
suffix = '.tar.bz2'
|
||||||
|
|
||||||
|
isReleaseCandidate = False
|
||||||
|
if len(sys.argv) > 2 and sys.argv[2] == 'release':
|
||||||
|
isReleaseCandidate = True
|
||||||
|
|
||||||
allSuffix = '*' + suffix
|
allSuffix = '*' + suffix
|
||||||
|
|
||||||
print "Wildcard pattern is:" + allSuffix
|
print "Wildcard pattern is:" + allSuffix
|
||||||
|
pattern = r'\w+-(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)([\w-]*)' + suffix
|
||||||
pattern = r'FlightGear-(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)-([\w-]+)' + suffix
|
|
||||||
publicNightlyRoot = "/var/www/html/builds/nightly"
|
|
||||||
incomingDir = "/home/jenkins/nightly-incoming"
|
|
||||||
sourceForgePath = "/home/frs/project/f/fl/flightgear/unstable/"
|
|
||||||
sourceForgeUserHost = "jmturner@frs.sourceforge.net"
|
sourceForgeUserHost = "jmturner@frs.sourceforge.net"
|
||||||
sftpCommandFile = "sftp-commands"
|
sftpCommandFile = "sftp-commands"
|
||||||
|
|
||||||
os.chdir(publicNightlyRoot)
|
if isReleaseCandidate:
|
||||||
|
publicRoot = "/var/www/html/builds/rc"
|
||||||
|
incomingDir = "/home/jenkins/incoming"
|
||||||
|
sourceForgePath = "/home/frs/project/f/fl/flightgear/release-candidate/"
|
||||||
|
else:
|
||||||
|
publicRoot = "/var/www/html/builds/nightly"
|
||||||
|
incomingDir = "/home/jenkins/nightly-incoming"
|
||||||
|
sourceForgePath = "/home/frs/project/f/fl/flightgear/unstable/"
|
||||||
|
|
||||||
|
os.chdir(publicRoot)
|
||||||
|
|
||||||
def findFileVersion(dir):
|
def findFileVersion(dir):
|
||||||
for file in os.listdir(dir):
|
for file in os.listdir(dir):
|
||||||
|
@ -42,6 +53,7 @@ existingVer = findFileVersion('.')
|
||||||
versionChange = (existingVer != incomingVer)
|
versionChange = (existingVer != incomingVer)
|
||||||
|
|
||||||
oldFiles = []
|
oldFiles = []
|
||||||
|
incomingFiles = []
|
||||||
newFiles = []
|
newFiles = []
|
||||||
|
|
||||||
if versionChange:
|
if versionChange:
|
||||||
|
@ -55,22 +67,33 @@ if versionChange:
|
||||||
|
|
||||||
for file in os.listdir(incomingDir):
|
for file in os.listdir(incomingDir):
|
||||||
if fnmatch.fnmatch(file, allSuffix):
|
if fnmatch.fnmatch(file, allSuffix):
|
||||||
newFiles.append(file)
|
incomingFiles.append(file)
|
||||||
|
|
||||||
# copy and symlink
|
# copy and symlink
|
||||||
for file in newFiles:
|
for file in incomingFiles:
|
||||||
# move it to the public location
|
# move it to the public location
|
||||||
srcFile = os.path.join(incomingDir, file)
|
srcFile = os.path.join(incomingDir, file)
|
||||||
os.rename(srcFile, file)
|
|
||||||
|
|
||||||
|
outFile = file
|
||||||
|
# insert -rc before suffix
|
||||||
|
if isReleaseCandidate:
|
||||||
|
m = re.match(r'(\w+-\d+\.\d+\.\d+[\w-]*)' + suffix, file)
|
||||||
|
outFile = m.group(1) + '-rc' + suffix
|
||||||
|
print "RC out name is " + outFile
|
||||||
|
|
||||||
|
os.rename(srcFile, outFile)
|
||||||
|
newFiles.append(outFile)
|
||||||
|
|
||||||
|
if not isReleaseCandidate:
|
||||||
# symlink for stable web URL
|
# symlink for stable web URL
|
||||||
m = re.match(r'FlightGear-\d+\.\d+\.\d+-([\w-]+)' + suffix, file)
|
m = re.match(r'(\w+)-\d+\.\d+\.\d+-([\w-]+)' + suffix, file)
|
||||||
latestName = 'FlightGear-latest-' + m.group(1) + suffix
|
latestName = m.group(1) + '-latest-' + m.group(2) + suffix
|
||||||
|
|
||||||
if os.path.exists(latestName):
|
if os.path.exists(latestName):
|
||||||
os.remove(latestName)
|
os.remove(latestName)
|
||||||
os.symlink(file, latestName)
|
os.symlink(file, latestName)
|
||||||
|
|
||||||
|
|
||||||
# remove files from SF
|
# remove files from SF
|
||||||
if len(oldFiles) > 0:
|
if len(oldFiles) > 0:
|
||||||
f = open(sftpCommandFile, 'w')
|
f = open(sftpCommandFile, 'w')
|
||||||
|
@ -88,5 +111,3 @@ if len(oldFiles) > 0:
|
||||||
for file in newFiles:
|
for file in newFiles:
|
||||||
print "Uploading " + file + " to SourceForge"
|
print "Uploading " + file + " to SourceForge"
|
||||||
call(["scp", file, sourceForgeUserHost + ":" + sourceForgePath + file])
|
call(["scp", file, sourceForgeUserHost + ":" + sourceForgePath + file])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue