From d5ad9c75fa9e50bc5dc9f6314dd7e6428bd1bcaa Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 10 Jul 2020 12:57:17 +0100 Subject: [PATCH 01/19] Increase time to do project importing before timeout --- 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 9225100..1fd9078 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: 5, unit: 'MINUTES') { + timeout(time: 10, unit: 'MINUTES') { addToolchainPath(toolchainfolder) doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) } From 95f1278e4c5ba88fbc9f90e1a7e6b4ca13272cde Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 22:20:44 +0100 Subject: [PATCH 02/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 75 +++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 documentation/doxygen_deploy.groovy diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy new file mode 100644 index 0000000..736ed10 --- /dev/null +++ b/documentation/doxygen_deploy.groovy @@ -0,0 +1,75 @@ +pipeline { + agent { label "${AGENT_LABEL}" } + stages { + stage('Initial setup') { + steps { + script { + meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startnonbuild(this) + } + } + } + stage('Clean imports') { + steps { + script { + env.DOXYGEN = "doxygen" + cleanfolders = [ + DOXYGEN, + ] + cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") + cleaner.clean(cleanfolders) + } + } + } + stage('Import doxygen artifacts') { + steps { + script { + importer = load("${autobuilder.commonscripts()}/import/importer.groovy") + def importoptions = new ImportOptions(this) + + importoptions.jenkinsjob(BUILD_JOB_WITH_DOXYGEN_ARTIFACTS, BUILD_JOB_WITH_DOXYGEN_ARTIFACTS_SELECTOR) + importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**') + doxygenmeta = importer.artifactimportfrombuildjob(meta, importoptions, DOXYGEN) + } + } + } +/* + + stage('Clean exports') { + steps { + script { + env.DOXYGEN = "api_docs" + cleanfolders = [ + API_DOCS, + ] + cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") + cleaner.clean(cleanfolders) + } + } + } + + stage('Copy api docs') { + steps { + script { + dir("${SOURCEDIR}/documents/api/public") { + fileOperations([fileCopyOperation(targetLocation: "${WORKSPACE}/${API_DOCS}", includes: '*.docx,*.pptx')]) + } + } + } + } +*/ + } + post { + always { + echo 'Post-build' + } + failure { + echo 'Failed build' + } + unstable { + echo 'Unstable build' + } + success { + echo 'Succeeded build' + } + } +} From 6fa1bdaeaf4acf494a2161792fbdb762baec94e7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 22:22:08 +0100 Subject: [PATCH 03/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 736ed10..af127ea 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -24,7 +24,7 @@ pipeline { steps { script { importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - def importoptions = new ImportOptions(this) + def importoptions = new importer.ImportOptions(this) importoptions.jenkinsjob(BUILD_JOB_WITH_DOXYGEN_ARTIFACTS, BUILD_JOB_WITH_DOXYGEN_ARTIFACTS_SELECTOR) importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**') From 906714ac24a2992fa790cf2e6358f80bc329bbcb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 22:26:05 +0100 Subject: [PATCH 04/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index af127ea..dc442b6 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -24,7 +24,7 @@ pipeline { steps { script { importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - def importoptions = new importer.ImportOptions(this) + def importoptions = importer.getNewImportOptions(this) importoptions.jenkinsjob(BUILD_JOB_WITH_DOXYGEN_ARTIFACTS, BUILD_JOB_WITH_DOXYGEN_ARTIFACTS_SELECTOR) importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**') From caf62da190dc894ef5749bda54537f4b98e3afa9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 22:30:24 +0100 Subject: [PATCH 05/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index dc442b6..ae0c063 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -24,7 +24,7 @@ pipeline { steps { script { importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - def importoptions = importer.getNewImportOptions(this) + def importoptions = importer.getNewImportOptions() importoptions.jenkinsjob(BUILD_JOB_WITH_DOXYGEN_ARTIFACTS, BUILD_JOB_WITH_DOXYGEN_ARTIFACTS_SELECTOR) importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**') From bbbd7b6af6a3bc1943853ac55796cf639e848a1e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 22:42:54 +0100 Subject: [PATCH 06/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index ae0c063..3586860 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -29,6 +29,11 @@ pipeline { importoptions.jenkinsjob(BUILD_JOB_WITH_DOXYGEN_ARTIFACTS, BUILD_JOB_WITH_DOXYGEN_ARTIFACTS_SELECTOR) importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**') doxygenmeta = importer.artifactimportfrombuildjob(meta, importoptions, DOXYGEN) + + productname = doxygenmeta.productinfo.productname + buildstampprefix = doxygenmeta.buildstampinfo.buildstampprefix + + echo "Doyxgen imported for product: ${productname} and build stamp prefix: ${buildstampprefix}" } } } From 9c81da3e19c970f80f0317304ca46e130428b133 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 23:02:33 +0100 Subject: [PATCH 07/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 3586860..f84e7b0 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -34,34 +34,34 @@ pipeline { buildstampprefix = doxygenmeta.buildstampinfo.buildstampprefix echo "Doyxgen imported for product: ${productname} and build stamp prefix: ${buildstampprefix}" + + pathonserver = "${ROOT_PATH_ON_SERVER}/${productname}/${buildstampprefix}" } } } -/* - - stage('Clean exports') { + stage('Clean destination') { steps { script { - env.DOXYGEN = "api_docs" cleanfolders = [ - API_DOCS, + pathonserver, ] cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") cleaner.clean(cleanfolders) } } } - - stage('Copy api docs') { + + stage('Copy doxygen to server') { steps { script { - dir("${SOURCEDIR}/documents/api/public") { - fileOperations([fileCopyOperation(targetLocation: "${WORKSPACE}/${API_DOCS}", includes: '*.docx,*.pptx')]) + doxygensource = "${DOXYGEN}/${DOXYGEN ARTIFACT_PATH_TO_DOXYGEN_ROOT)" + echo "Copying from ${doxygensource} to ${pathonserver}" + dir(doxygensource { + fileOperations([fileCopyOperation(targetLocation: pathonserver)]) } } } } -*/ } post { always { From e4086c3aee9a00341f059cf47cba84b1c411e5cb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 23:04:32 +0100 Subject: [PATCH 08/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index f84e7b0..6c92467 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -54,7 +54,7 @@ pipeline { stage('Copy doxygen to server') { steps { script { - doxygensource = "${DOXYGEN}/${DOXYGEN ARTIFACT_PATH_TO_DOXYGEN_ROOT)" + doxygensource = "${DOXYGEN}/${DOXYGEN ARTIFACT_PATH_TO_DOXYGEN_ROOT}" echo "Copying from ${doxygensource} to ${pathonserver}" dir(doxygensource { fileOperations([fileCopyOperation(targetLocation: pathonserver)]) From 748d9f7e667112aee4de508e741727468c9744a9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 23:07:30 +0100 Subject: [PATCH 09/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 6c92467..8fd41ce 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -56,7 +56,7 @@ pipeline { script { doxygensource = "${DOXYGEN}/${DOXYGEN ARTIFACT_PATH_TO_DOXYGEN_ROOT}" echo "Copying from ${doxygensource} to ${pathonserver}" - dir(doxygensource { + dir(doxygensource) { fileOperations([fileCopyOperation(targetLocation: pathonserver)]) } } From 8477a500ceff047471bd8a4d6eca87067a8f56f8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 23:09:48 +0100 Subject: [PATCH 10/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 8fd41ce..0c2d4a2 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -54,7 +54,7 @@ pipeline { stage('Copy doxygen to server') { steps { script { - doxygensource = "${DOXYGEN}/${DOXYGEN ARTIFACT_PATH_TO_DOXYGEN_ROOT}" + doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}" echo "Copying from ${doxygensource} to ${pathonserver}" dir(doxygensource) { fileOperations([fileCopyOperation(targetLocation: pathonserver)]) From 6daa1d6106b8e0a07748563f35cddab03ea300b4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 5 Sep 2020 23:19:12 +0100 Subject: [PATCH 11/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 0c2d4a2..d8422a4 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -56,6 +56,8 @@ pipeline { script { doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}" echo "Copying from ${doxygensource} to ${pathonserver}" + dir(pathonserver) { + } dir(doxygensource) { fileOperations([fileCopyOperation(targetLocation: pathonserver)]) } From 2ae9dfcecc4ad6271be1a5a83326e69c6cb1d68d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 08:27:55 +0100 Subject: [PATCH 12/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 34 +++++++++++++---------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index d8422a4..db96b43 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -34,32 +34,28 @@ pipeline { buildstampprefix = doxygenmeta.buildstampinfo.buildstampprefix echo "Doyxgen imported for product: ${productname} and build stamp prefix: ${buildstampprefix}" - - pathonserver = "${ROOT_PATH_ON_SERVER}/${productname}/${buildstampprefix}" } } } - stage('Clean destination') { - steps { - script { - cleanfolders = [ - pathonserver, - ] - cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") - cleaner.clean(cleanfolders) - } - } - } - stage('Copy doxygen to server') { steps { script { doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}" - echo "Copying from ${doxygensource} to ${pathonserver}" - dir(pathonserver) { - } - dir(doxygensource) { - fileOperations([fileCopyOperation(targetLocation: pathonserver)]) + pathonserver = "${ROOT_PATH_ON_SERVER.trim()}/${productname}/${buildstampprefix}" + echo "Moving from ${doxygensource} to ${pathonserver}" + if isUnix() { + sh """#!/bin/bash + rm -rfv "${pathonserver}" + if [ \$? -ne 0 ]; then exit 1; fi + + mkdir -pv "${pathonserver}" + if [ \$? -ne 0 ]; then exit 1; fi + + mv -v "${doxygensource}"/* "${pathonserver}" + if [ \$? -ne 0 ]; then exit 1; fi + + } else { + error("This job does not run on Windows at the moment") } } } From 226ac5916263e17984c1fa0d2c935a7528a802c9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 08:28:58 +0100 Subject: [PATCH 13/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index db96b43..474307b 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -43,7 +43,7 @@ pipeline { doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}" pathonserver = "${ROOT_PATH_ON_SERVER.trim()}/${productname}/${buildstampprefix}" echo "Moving from ${doxygensource} to ${pathonserver}" - if isUnix() { + if (isUnix()) { sh """#!/bin/bash rm -rfv "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi From 8fd7cda8b6be6f337bdc027aece4af86b9354adf Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 08:40:47 +0100 Subject: [PATCH 14/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 474307b..2077b25 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -75,4 +75,4 @@ pipeline { echo 'Succeeded build' } } -} +} \ No newline at end of file From fcd01335deadd3229be32a57a06d55c817a6d5e4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 08:45:52 +0100 Subject: [PATCH 15/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 2077b25..9eeb55d 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -75,4 +75,5 @@ pipeline { echo 'Succeeded build' } } -} \ No newline at end of file +} + From 1e9b5afaf0f0be61fedd74600e3f78dacdabed6e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 08:47:50 +0100 Subject: [PATCH 16/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 9eeb55d..d30ddf6 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -53,7 +53,7 @@ pipeline { mv -v "${doxygensource}"/* "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi - + """ } else { error("This job does not run on Windows at the moment") } From c473cfbb6efe6b43cda4148ddd2b6a302b42174b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 08:57:56 +0100 Subject: [PATCH 17/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index d30ddf6..26a15f3 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -42,7 +42,7 @@ pipeline { script { doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}" pathonserver = "${ROOT_PATH_ON_SERVER.trim()}/${productname}/${buildstampprefix}" - echo "Moving from ${doxygensource} to ${pathonserver}" + echo "Copying from ${doxygensource} to ${pathonserver}" if (isUnix()) { sh """#!/bin/bash rm -rfv "${pathonserver}" @@ -51,7 +51,7 @@ pipeline { mkdir -pv "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi - mv -v "${doxygensource}"/* "${pathonserver}" + cp -rv "${doxygensource}"/* "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi """ } else { From b1262ef4ee42dbfbad7221b0e7f5226e0759f0e1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 09:05:12 +0100 Subject: [PATCH 18/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 26a15f3..c57eedd 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -50,7 +50,8 @@ pipeline { mkdir -pv "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi - + + echo cp -rv "${doxygensource}"/* "${pathonserver}" cp -rv "${doxygensource}"/* "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi """ From bde11981fcc1f2efae0438cd091c5dd24748a7ff Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 6 Sep 2020 09:15:15 +0100 Subject: [PATCH 19/19] Add doxygen deployment script --- documentation/doxygen_deploy.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index c57eedd..6642256 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -51,8 +51,8 @@ pipeline { mkdir -pv "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi - echo cp -rv "${doxygensource}"/* "${pathonserver}" - cp -rv "${doxygensource}"/* "${pathonserver}" + echo mv -v "${doxygensource}"/ "${pathonserver}" + mv -v "${doxygensource}"/ "${pathonserver}" if [ \$? -ne 0 ]; then exit 1; fi """ } else {