This commit is contained in:
Dan Hawkins 2018-10-29 13:30:09 +00:00
commit d296da9e8d
4 changed files with 16 additions and 5 deletions

View file

@ -1,4 +1,4 @@
gh = load("${WORKSPACE}/Common_scripts/versioncontrol/git.gsh")
gh = load("${COMMON_SCRIPTS}/versioncontrol/git.gsh")
configurationCollection = [:]
@ -8,7 +8,7 @@ def registerConfigurationInfo(String configurationName, String configurationURL,
}
def registerPipelineScriptConfiguration() {
registerConfigurationInfo('pipeline script', '-', '-', gh.getGitInfo("${WORKSPACE}"))
registerConfigurationInfo('pipeline script', '-', '-', gh.getGitInfo("${AUTOBUILD_SCRIPTS}"))
}
def saveConfigurationInVersionInfo() {

View file

@ -78,6 +78,9 @@ jiraprojectpattern = {
'SMB': ( re.compile("^.* +(?:[Ss][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *SMB-(\d+):* (.*)"$'),
),
'MCS': ( re.compile("^.* +(?:[Mm][Cc][Ss][ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *MCS-(\d+):* (.*)"$'),
),
'HMBFDHV': ( re.compile("^.* +(?:[Hh][Mm][Bb][Ff][Dd][Hh][Vv][ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *HMBFDHV-(\d+):* (.*)"$'),
),

View file

@ -1,4 +1,4 @@
clh = load("${WORKSPACE}/Common_scripts/commandline/commandline.gsh")
clh = load("${COMMON_SCRIPTS}/commandline/commandline.gsh")
String getGitInfo(String workingSetRootPath) {
dir(workingSetRootPath) {
@ -43,9 +43,13 @@ String getSHAFromVersion(String versionFolder) {
boolean checkAllVersionsAgree(java.util.LinkedHashMap versions) {
def keys = versions.keySet()
if (keys.size() <= 1) {
if (keys.size() < 1) {
return false
} else {
}
if (keys.size() == 1) {
return true
}
else {
version = ""
for (key in keys) {
nextversion = versions.get(key)

View file

@ -13,6 +13,7 @@ import sys
import shutil
import subprocess
import re
import datetime
from argparse import ArgumentParser
from argparse import RawDescriptionHelpFormatter
@ -151,6 +152,9 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou
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()))
def main(argv=None): # IGNORE:C0111
'''Command line options.'''