fly/fgmeta
1
0
Fork 0
Code Activity

use release instead of -rc suffix

Browse source
This commit is contained in:
Torsten Dreyer 2017-02-09 17:46:09 +01:00
parent 2c7e8318db
commit fcf5087da9
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
post_upload.py
View file

@ -8,14 +8,19 @@ import os, sys, re, fnmatch
from subprocess import call from subprocess import call
suffix = '.dmg' suffix = '.dmg'
release_version = "unknown"
if sys.argv[1] == 'windows': if sys.argv[1] == 'windows':
suffix = '.exe' suffix = '.exe'
if sys.argv[1] == 'linux': if sys.argv[1] == 'linux':
suffix = '.tar.bz2' suffix = '.tar.bz2'
isReleaseCandidate = False isRelease = False
if len(sys.argv) > 2 and sys.argv[2] == 'release': if len(sys.argv) > 2 and sys.argv[2] == 'release':
isReleaseCandidate = True isRelease = True
if len(sys.argv) > 3:
release_version = sys.argv[3]
allSuffix = '*' + suffix allSuffix = '*' + suffix
@ -25,10 +30,10 @@ sourceForgeUserHost = "jmturner@frs.sourceforge.net"
sftpCommandFile = "sftp-commands" sftpCommandFile = "sftp-commands"
symbolDir = "/home/jenkins/symbols" symbolDir = "/home/jenkins/symbols"
if isReleaseCandidate: if isRelease:
publicRoot = "/var/www/html/builds/rc" publicRoot = "/var/www/html/builds/rc"
incomingDir = "/home/jenkins/incoming" incomingDir = "/home/jenkins/incoming"
sourceForgePath = "/home/frs/project/f/fl/flightgear/release-candidate/" sourceForgePath = "/home/frs/project/f/fl/flightgear/release-" + release_version + "/"
else: else:
publicRoot = "/var/www/html/builds/nightly" publicRoot = "/var/www/html/builds/nightly"
incomingDir = "/home/jenkins/nightly-incoming" incomingDir = "/home/jenkins/nightly-incoming"
@ -81,15 +86,15 @@ for file in incomingFiles:
outFile = file outFile = file
# insert -rc before suffix # insert -rc before suffix
if isReleaseCandidate: #if isRelease:
m = re.match(r'(\w+-\d+\.\d+\.\d+[\w-]*)' + suffix, file) #m = re.match(r'(\w+-\d+\.\d+\.\d+[\w-]*)' + suffix, file)
outFile = m.group(1) + '-rc' + suffix #outFile = m.group(1) + '-rc' + suffix
print "RC out name is " + outFile #print "RC out name is " + outFile
os.rename(srcFile, outFile) os.rename(srcFile, outFile)
newFiles.append(outFile) newFiles.append(outFile)
if not isReleaseCandidate: if not isRelease:
# symlink for stable web URL # symlink for stable web URL
m = re.match(r'(\w+)-\d+\.\d+\.\d+-([\w-]+)' + suffix, file) m = re.match(r'(\w+)-\d+\.\d+\.\d+-([\w-]+)' + suffix, file)
latestName = m.group(1) + '-latest-' + m.group(2) + suffix latestName = m.group(1) + '-latest-' + m.group(2) + suffix
@ -102,17 +107,17 @@ for file in incomingFiles:
# remove files from SF # remove files from SF
if len(oldFiles) > 0: #if len(oldFiles) > 0:
f = open(sftpCommandFile, 'w') # f = open(sftpCommandFile, 'w')
f.write("cd " + sourceForgePath + '\n') # f.write("cd " + sourceForgePath + '\n')
for file in oldFiles: # for file in oldFiles:
print "Removing file " + file + " from SourceForge" # print "Removing file " + file + " from SourceForge"
f.write("rm " + file + '\n') # f.write("rm " + file + '\n')
f.write("bye\n") # f.write("bye\n")
f.close() # f.close()
#
call(["sftp", "-b", sftpCommandFile, sourceForgeUserHost]) # call(["sftp", "-b", sftpCommandFile, sourceForgeUserHost])
os.remove(sftpCommandFile) # os.remove(sftpCommandFile)
# upload to SourceForge # upload to SourceForge
for file in newFiles: for file in newFiles: