From c2582fe710abe4d307c5fde5eb17f02a4a6cfd67 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 28 Oct 2019 11:53:49 +0000 Subject: [PATCH 1/7] Updated scripts to refer to SI1536 head. --- 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 5c0f15d..2b7f589 100644 --- a/differences/show_release_differences.py +++ b/differences/show_release_differences.py @@ -83,6 +83,9 @@ jiraprojectpattern = { 'HMBFDGMA': ( re.compile("^.* +(?:[Hh][Mm][Bb][Ff][Dd][Gg][Mm][Aa][ _-]*|\#\s*)(\d+):*(.*)$"), re.compile('^(\S*) Revert " *HMBFDGMA-(\d+):* (.*)"$'), ), + 'HMBSI1536': ( re.compile("^.* +(?:[Hh][Mm][Bb][Ss][Ii]1536[ _-]*|\#\s*)(\d+):*(.*)$"), + re.compile('^(\S*) Revert " *HMBSI1536-(\d+):* (.*)"$'), + ), } mergepattern = re.compile("^(.*)((?:Merge branch '.*'|Merge remote-tracking branch '.*'|Merge commit '.*'|Add '.*' from commit).*)$") From b94b0cba262c9d19fbbd503b5efefa1056163557 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 11 Jan 2020 23:18:20 +0000 Subject: [PATCH 2/7] Remove redundant parameter --- release/release.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/release/release.groovy b/release/release.groovy index 79c0234..26250ac 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -4,8 +4,7 @@ pipeline { stage('Initial setup') { steps { script { - autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") - meta = autobuilderscript.start(this, PRODUCT_NAME, SUBCOMPONENT_NAME, JIRA_KEY, RELEASE_REPO) + meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startbuild(this, PRODUCT_NAME, SUBCOMPONENT_NAME, RELEASE_REPO) } } } From d7e2e117916a498a0dc4cb1ed190ed8be6d5bace Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 11 Jan 2020 23:24:21 +0000 Subject: [PATCH 3/7] Autobuilderscript definition is needed later --- release/release.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/release.groovy b/release/release.groovy index 26250ac..a265c5b 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -4,7 +4,8 @@ pipeline { stage('Initial setup') { steps { script { - meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startbuild(this, PRODUCT_NAME, SUBCOMPONENT_NAME, RELEASE_REPO) + autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") + meta = autobuilderscript.startbuild(this, PRODUCT_NAME, SUBCOMPONENT_NAME, RELEASE_REPO) } } } From 09154e93c2e349d862e1ae65b5b1c4509b50c929 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 20 Jan 2020 10:53:36 +0000 Subject: [PATCH 4/7] Make release script use new API --- release/release.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/release/release.groovy b/release/release.groovy index 79c0234..88c4e7b 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -4,8 +4,7 @@ pipeline { stage('Initial setup') { steps { script { - autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") - meta = autobuilderscript.start(this, PRODUCT_NAME, SUBCOMPONENT_NAME, JIRA_KEY, RELEASE_REPO) + meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startbuild(this, PRODUCT_NAME, SUBCOMPONENT_NAME, RELEASE_REPO) } } } @@ -86,4 +85,3 @@ pipeline { } } } - From d8b38d9d0c4633bccba3fd8ae493c3f26e062156 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 20 Jan 2020 11:04:14 +0000 Subject: [PATCH 5/7] Make release script use new API --- release/release.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/release.groovy b/release/release.groovy index 88c4e7b..e51a174 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -4,7 +4,8 @@ pipeline { stage('Initial setup') { steps { script { - meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startbuild(this, PRODUCT_NAME, SUBCOMPONENT_NAME, RELEASE_REPO) + autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") + meta = autobuilderscript.startbuild(this, PRODUCT_NAME, SUBCOMPONENT_NAME, RELEASE_REPO) } } } From d48825be597273ee8e3ff2208ef4ce401d19801c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 22 Jan 2020 14:48:32 +0000 Subject: [PATCH 6/7] Use non-deprecated API --- publish/publish.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/publish.groovy b/publish/publish.groovy index 5750275..7beb134 100644 --- a/publish/publish.groovy +++ b/publish/publish.groovy @@ -5,7 +5,7 @@ pipeline { steps { script { autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy") - meta = autobuilderscript.start(this, PRODUCT_NAME, SUBCOMPONENT_NAME, JIRA_KEY, RELEASE_REPO) + meta = autobuilderscript.startbuild(this, PRODUCT_NAME, SUBCOMPONENT_NAME, RELEASE_REPO) } } } From 0285f044100a81f4215253ad09796d5fc6f29f84 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 29 Jan 2020 17:21:37 +0000 Subject: [PATCH 7/7] Up the timeout protecting eclipse project opening --- compile/eclipsebuild/eclipseds5build.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.groovy b/compile/eclipsebuild/eclipseds5build.groovy index 3e58e4f..9225100 100644 --- a/compile/eclipsebuild/eclipseds5build.groovy +++ b/compile/eclipsebuild/eclipseds5build.groovy @@ -227,7 +227,7 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou // The lock is being used because it was being found that the doKillLeftovers was affecting other builds lock(resource: "eclipsebuild_${env.NODE_NAME}") { try { - timeout(time: 2, unit: 'MINUTES') { + timeout(time: 5, unit: 'MINUTES') { addToolchainPath(toolchainfolder) doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) }