From 4d9723e6155fb264bcebfcd44e5ba79740c58f07 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 27 Oct 2018 10:25:22 +0100 Subject: [PATCH 1/6] MCS compile should use build stamp generated by Common_scripts --- versionnumbering/versioninfo.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py index b0d8ba1..62af192 100644 --- a/versionnumbering/versioninfo.py +++ b/versionnumbering/versioninfo.py @@ -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.''' From 34e273f84a839d485344e24a372defea78d50054 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 27 Oct 2018 10:45:59 +0100 Subject: [PATCH 2/6] Add MCS jira key search --- differences/show_release_differences.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/differences/show_release_differences.py b/differences/show_release_differences.py index 4937134..2d3ee0d 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -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+):* (.*)"$'), ), From 476b4a59489df06cc15a6c29b7bf4ef514ef4d41 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 27 Oct 2018 10:56:49 +0100 Subject: [PATCH 3/6] Change base build number to match previous build system --- versionnumbering/versioninfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py index 62af192..1a6a72b 100644 --- a/versionnumbering/versioninfo.py +++ b/versionnumbering/versioninfo.py @@ -153,7 +153,7 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou f.write(slaveMachine) with open(os.path.join(versionfolder, "builddate.txt"), 'w') as f: - f.write(str(datetime.datetime.now)) + f.write(str(datetime.datetime.now())) def main(argv=None): # IGNORE:C0111 '''Command line options.''' From a441a0ba43586b6ff9db5c90d146e59f4e135f3a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 28 Oct 2018 00:24:11 +0100 Subject: [PATCH 4/6] Handle case where there only one version folder --- versioncontrol/git.gsh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/versioncontrol/git.gsh b/versioncontrol/git.gsh index dbc09ff..904394d 100644 --- a/versioncontrol/git.gsh +++ b/versioncontrol/git.gsh @@ -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) From eaa8de01d5169f93d19b98699bd066e1650b4aea Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 29 Oct 2018 11:43:56 +0000 Subject: [PATCH 5/6] Move autobuild scripts into their own folder --- configuration/configuration.gsh | 2 +- versioncontrol/git.gsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration/configuration.gsh b/configuration/configuration.gsh index b91e0a3..9f60c0a 100644 --- a/configuration/configuration.gsh +++ b/configuration/configuration.gsh @@ -1,4 +1,4 @@ -gh = load("${WORKSPACE}/Common_scripts/versioncontrol/git.gsh") +gh = load("${COMMON_SCRIPTS}/versioncontrol/git.gsh") configurationCollection = [:] diff --git a/versioncontrol/git.gsh b/versioncontrol/git.gsh index 904394d..51dbd5d 100644 --- a/versioncontrol/git.gsh +++ b/versioncontrol/git.gsh @@ -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) { From 29d0f5e2ad63ff325ff9d5b2972b5d4b7b59f640 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 29 Oct 2018 11:52:23 +0000 Subject: [PATCH 6/6] Move autobuild scripts into their own folder --- configuration/configuration.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/configuration.gsh b/configuration/configuration.gsh index 9f60c0a..5688482 100644 --- a/configuration/configuration.gsh +++ b/configuration/configuration.gsh @@ -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() {