Move functionality to meta
This commit is contained in:
parent
632b08b6e9
commit
97f31cf313
4 changed files with 48 additions and 27 deletions
|
|
@ -37,7 +37,10 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA
|
|||
def metafolder = load("${commonscripts()}/meta/folder.groovy")
|
||||
def meta = metafolder.metareset(script)
|
||||
meta.productinfo.set(productname, subcomponentname, jirakey)
|
||||
|
||||
def now = new Date()
|
||||
now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC'))
|
||||
meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID, NODE_NAME, now)
|
||||
|
||||
def ch = load("${commonscripts()}/configuration/configuration.groovy")
|
||||
ch.registerPipelineScriptConfiguration(meta)
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ class JenkinsBuildInfo extends GISJsonSerialised {
|
|||
private String buildmachine
|
||||
private String builddate
|
||||
|
||||
JenkinsBuildInfo(script, buildjobname = "", buildnumber = 0, buildmachine = "", builddate = "") {
|
||||
JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "") {
|
||||
super(script)
|
||||
this.buildjobname = buildjobname
|
||||
this.buildnumber = buildnumber
|
||||
|
|
@ -87,6 +87,13 @@ class JenkinsBuildInfo extends GISJsonSerialised {
|
|||
this.builddate = builddate
|
||||
}
|
||||
|
||||
def set(String buildjobname, int buildnumber, String buildmachine, String builddate) {
|
||||
this.buildjobname = buildjobname
|
||||
this.buildnumber = buildnumber
|
||||
this.buildmachine = buildmachine
|
||||
this.builddate = builddate
|
||||
}
|
||||
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'buildjobname' : buildjobname,
|
||||
|
|
@ -131,6 +138,10 @@ class ReleaseInfo extends GISJsonSerialised {
|
|||
this.releasejobname = releasejobname
|
||||
}
|
||||
|
||||
def set(releasejobname) {
|
||||
this.releasejobname = releasejobname
|
||||
}
|
||||
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'releasejobname' : releasejobname,
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy")
|
||||
VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version"
|
||||
|
||||
def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") {
|
||||
def generate(meta, sourcerevision, sourcepath, basebuildnumber = "1000", versionfolder = "${VERSIONFOLDER}") {
|
||||
def cs = autobuilder.commonscripts()
|
||||
if (isUnix()) {
|
||||
sh """
|
||||
"${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}"
|
||||
"${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}"
|
||||
"""
|
||||
}
|
||||
else {
|
||||
bat """
|
||||
"${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}"
|
||||
"${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}"
|
||||
"""
|
||||
}
|
||||
env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim()
|
||||
|
|
@ -20,3 +20,29 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam
|
|||
}
|
||||
|
||||
return this;
|
||||
|
||||
|
||||
/*
|
||||
|
||||
with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f:
|
||||
f.write(versionprefix)
|
||||
|
||||
with open(os.path.join(versionfolder, "revision.txt"), 'w') as f:
|
||||
f.write(str(gitrevisioncount))
|
||||
|
||||
with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f:
|
||||
f.write(gitrevision)
|
||||
|
||||
with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f:
|
||||
f.write(remoteinfo)
|
||||
|
||||
with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f:
|
||||
f.write(remoteurl)
|
||||
|
||||
with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f:
|
||||
f.write(buildstamp)
|
||||
|
||||
buildstampcommasep = buildstamp.replace(".", ",")
|
||||
with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f:
|
||||
f.write(buildstampcommasep)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ __date__ = '2017-11-29'
|
|||
__updated__ = '2017-11-29'
|
||||
|
||||
gitExecutable = os.getenv("GIT_EXECUTABLE", default="git")
|
||||
slaveMachine = os.getenv("NODE_NAME", default="-")
|
||||
MAXVERSIONNUMBER = 65535
|
||||
|
||||
def resetFolder(versionfolder):
|
||||
|
|
@ -138,10 +137,7 @@ def getVersionPrefix(sourcebranch):
|
|||
print("Determined version prefix to be: {0}".format(versionprefix))
|
||||
return versionprefix
|
||||
|
||||
def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname):
|
||||
with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f:
|
||||
f.write(buildjobname)
|
||||
|
||||
def writeversionfiles(versionfolder, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildstamp):
|
||||
with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f:
|
||||
f.write(versionprefix)
|
||||
|
||||
|
|
@ -157,9 +153,6 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou
|
|||
with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f:
|
||||
f.write(remoteurl)
|
||||
|
||||
with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f:
|
||||
f.write(buildnumber)
|
||||
|
||||
with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f:
|
||||
f.write(buildstamp)
|
||||
|
||||
|
|
@ -167,15 +160,9 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou
|
|||
with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f:
|
||||
f.write(buildstampcommasep)
|
||||
|
||||
with open(os.path.join(versionfolder, "buildmachine.txt"), 'w') as f:
|
||||
f.write(slaveMachine)
|
||||
|
||||
with open(os.path.join(versionfolder, "builddate.txt"), 'w') as f:
|
||||
f.write(str(datetime.datetime.now()))
|
||||
|
||||
with open(os.path.join(versionfolder, "releasejobname.txt"), 'w') as f:
|
||||
f.write(releasejobname)
|
||||
|
||||
def main(argv=None): # IGNORE:C0111
|
||||
'''Command line options.'''
|
||||
|
||||
|
|
@ -207,9 +194,6 @@ USAGE
|
|||
parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="version", help="version folder to be created [default: %(default)s]")
|
||||
parser.add_argument("-g", "--gitroot", dest="gitrootfolder", action="store", default="GitRepository", help="root path of source files [default: %(default)s]")
|
||||
parser.add_argument("-b", "--baseversionnumber", dest="baseversionnumber", action="store", default=int(1000), help="base git version number [default: %(default)s]")
|
||||
parser.add_argument("-j", "--buildjobname", dest="buildjobname", action="store", default="-", help="build job name [default: %(default)s]")
|
||||
parser.add_argument("-n", "--buildnumber", dest="buildnumber", action="store", default="1", help="build number [default: %(default)s]")
|
||||
parser.add_argument("-r", "--releasejobname", dest="releasejobname", action="store", default="-", help="release-to-git build job name [default: %(default)s]")
|
||||
|
||||
# Process arguments
|
||||
args = parser.parse_args()
|
||||
|
|
@ -219,12 +203,9 @@ USAGE
|
|||
versionfolder = args.versionfolder
|
||||
gitrootfolder = args.gitrootfolder
|
||||
baseversionnumber = args.baseversionnumber
|
||||
buildjobname = args.buildjobname
|
||||
buildnumber = args.buildnumber
|
||||
releasejobname = args.releasejobname
|
||||
|
||||
print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder)
|
||||
print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber, "Release job name:", releasejobname)
|
||||
print("Base version number:", baseversionnumber)
|
||||
|
||||
resetFolder(versionfolder)
|
||||
|
||||
|
|
@ -235,7 +216,7 @@ USAGE
|
|||
buildstamp = versionprefix + str(gitrevisioncount)
|
||||
print("Build stamp is: {0}".format(buildstamp))
|
||||
|
||||
writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname)
|
||||
writeversionfiles(versionfolder, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildstamp)
|
||||
|
||||
return 0
|
||||
except Exception as e:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue