From 1b0b5b278b226a4eeee64a82db3a5b89ff88ecf8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 24 Oct 2020 21:12:50 +0100 Subject: [PATCH] Start using the build all script --- build/build_all.groovy | 229 +++-------------------------------------- compile/compile.groovy | 14 +-- 2 files changed, 17 insertions(+), 226 deletions(-) diff --git a/build/build_all.groovy b/build/build_all.groovy index 0792b1d..27a39d4 100644 --- a/build/build_all.groovy +++ b/build/build_all.groovy @@ -13,11 +13,10 @@ pipeline { script { configurationhelper = autobuilder.configurationhelper() - SOURCEURL = 'git@hydra:gis/atlas_ui.git' - SOURCEREVISION = "${SOURCE_REVISION}".trim() - SOURCEROOTDIR = 'atlas_ui' - SOURCEDIR = "${WORKSPACE}/atlas_ui" - configurationhelper.gitCheckoutAndRegister(meta, SOURCEROOTDIR, SOURCEURL, SOURCEREVISION, SOURCEDIR, SOURCEROOTDIR, 0, false) + SOURCEURL = 'git@hydra:atlas-ui-modules/custom-modules.git' + SOURCEREVISION = SOURCE_REVISION + SOURCEDIR = "${WORKSPACE}\\custom_modules" + configurationhelper.gitCheckoutAndRegister(meta, 'custom_modules', SOURCEURL, SOURCEREVISION, SOURCEDIR, '', 0, false) } } } @@ -25,78 +24,21 @@ pipeline { steps { script { version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - version.generate(meta, SOURCEREVISION, SOURCEDIR, BASEBUILDNUMBER) - } - } - } - stage('Import Print server to adjust version number') { - steps { - script { - importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - - def importoptions = importer.getNewImportOptions() - importoptions.source(PRINT_SERVER_ARTIFACT_LOCATION, - PRINT_SERVER_COMPILE_JOB, - PRINT_SERVER_BUILD_SELECTOR, - PRINT_SERVER_RELEASE_REPO, - PRINT_SERVER_RELEASE_REVISION) - importoptions.setincrementversionnumber(true) - importoptions.setfilter('meta/**'); - importoptions.setappendtoparentmeta(false) - importer.artifactimport(meta, importoptions, 'ps_bin') - } - } - } - stage('Import Atlas services to adjust version number') { - steps { - script { - def importoptions = importer.getNewImportOptions() - importoptions.source(ATLAS_SERVICES_ARTIFACT_LOCATION, - ATLAS_SERVICES_COMPILE_JOB, - ATLAS_SERVICES_BUILD_SELECTOR, - ATLAS_SERVICES_RELEASE_REPO, - ATLAS_SERVICES_RELEASE_REVISION) - importoptions.setincrementversionnumber(true) - importoptions.setfilter('meta/**'); - importoptions.setappendtoparentmeta(false) - importer.artifactimport(meta, importoptions, 'as_bin') + version.generate(meta, SOURCEREVISION, SOURCEDIR) } } } stage('Compile') { steps { script { - atlas_compile_job = build job: ATLAS_COMPILE_JOB, + modules_compile_job = build job: INK_UI_COMPILE_JOB, parameters: [ string(name: 'SOURCE_REVISION', value: SOURCEREVISION), - string(name: 'PRINT_SERVER_ARTIFACT_LOCATION', value: PRINT_SERVER_ARTIFACT_LOCATION), - string(name: 'PRINT_SERVER_COMPILE_JOB', value: PRINT_SERVER_COMPILE_JOB), - string(name: 'PRINT_SERVER_BUILD_SELECTOR', value: PRINT_SERVER_BUILD_SELECTOR), - string(name: 'PRINT_SERVER_RELEASE_REPO', value: PRINT_SERVER_RELEASE_REPO), - string(name: 'PRINT_SERVER_RELEASE_REVISION', value: PRINT_SERVER_RELEASE_REVISION), - string(name: 'ATLAS_SERVICES_ARTIFACT_LOCATION', value: ATLAS_SERVICES_ARTIFACT_LOCATION), - string(name: 'ATLAS_SERVICES_COMPILE_JOB', value: ATLAS_SERVICES_COMPILE_JOB), - string(name: 'ATLAS_SERVICES_BUILD_SELECTOR', value: ATLAS_SERVICES_BUILD_SELECTOR), - string(name: 'ATLAS_SERVICES_RELEASE_REPO', value: ATLAS_SERVICES_RELEASE_REPO), - string(name: 'ATLAS_SERVICES_RELEASE_REVISION', value: ATLAS_SERVICES_RELEASE_REVISION), - booleanParam(name: 'CLEAN_WORKSPACE', value: CLEAN_WORKSPACE), - ] - } - } - } - stage('Compile Atlas Ink UI') { - steps { - script { - ink_ui_compile_job = build job: INK_UI_COMPILE_JOB, - parameters: [ - string(name: 'SOURCE_REVISION', value: SOURCEREVISION), - string(name: 'ATLAS_UI_COMPILE_JOB', value: atlas_compile_job.getProjectName()), - string(name: 'ATLAS_UI_COMPILE_BUILD_SELECTOR', value: " ${atlas_compile_job.getNumber()}"), - string(name: 'PRINT_SERVER_ARTIFACT_LOCATION', value: PRINT_SERVER_ARTIFACT_LOCATION), - string(name: 'PRINT_SERVER_COMPILE_JOB', value: PRINT_SERVER_COMPILE_JOB), - string(name: 'PRINT_SERVER_BUILD_SELECTOR', value: PRINT_SERVER_BUILD_SELECTOR), - string(name: 'PRINT_SERVER_RELEASE_REPO', value: PRINT_SERVER_RELEASE_REPO), - string(name: 'PRINT_SERVER_RELEASE_REVISION', value: PRINT_SERVER_RELEASE_REVISION), + string(name: 'ATLAS_UI_ARTIFACT_LOCATION', value: ATLAS_UI_ARTIFACT_LOCATION, + string(name: 'ATLAS_UI_COMPILE_JOB', value: ATLAS_UI_COMPILE_JOB, + string(name: 'ATLAS_UI_BUILD_SELECTOR', value: ATLAS_UI_BUILD_SELECTOR), + string(name: 'ATLAS_UI_RELEASE_REPO', value: ATLAS_UI_RELEASE_REPO), + string(name: 'ATLAS_UI_RELEASE_REVISION', value: ATLAS_UI_RELEASE_REVISION), string(name: 'ATLAS_SERVICES_ARTIFACT_LOCATION', value: ATLAS_SERVICES_ARTIFACT_LOCATION), string(name: 'ATLAS_SERVICES_COMPILE_JOB', value: ATLAS_SERVICES_COMPILE_JOB), string(name: 'ATLAS_SERVICES_BUILD_SELECTOR', value: ATLAS_SERVICES_BUILD_SELECTOR), @@ -110,102 +52,16 @@ pipeline { stage('Second stage') { failFast true parallel { - stage('Check localisations') { - steps { - script { - localisation_check_job = build job: ATLAS_LOCALISATION_CHECK_JOB, - parameters: [ - string(name: 'SOURCE_REVISION', value: SOURCEREVISION), - string(name: 'ATLAS_UI_COMPILE_JOB', value: atlas_compile_job.getProjectName()), - string(name: 'ATLAS_UI_COMPILE_BUILD_SELECTOR', value: " ${atlas_compile_job.getNumber()}"), - booleanParam(name: 'CLEAN_WORKSPACE', value: CLEAN_WORKSPACE), - ] - } - } - } - stage('Build Atlas Professional installers') { - steps { - script { - atlas_pro_installer_job = build job: ATLAS_PROFESSIONAL_INSTALLER_BUILD_JOB - parameters: [ - string(name: 'SOURCE_REVISION', value: SOURCEREVISION), - string(name: 'ATLAS_UI_COMPILE_JOB', value: atlas_compile_job.getProjectName()), - string(name: 'ATLAS_UI_COMPILE_BUILD_SELECTOR', value: " ${atlas_compile_job.getNumber()}"), - string(name: 'PRINT_SERVER_ARTIFACT_LOCATION', value: PRINT_SERVER_ARTIFACT_LOCATION), - string(name: 'PRINT_SERVER_COMPILE_JOB', value: PRINT_SERVER_COMPILE_JOB), - string(name: 'PRINT_SERVER_BUILD_SELECTOR', value: PRINT_SERVER_BUILD_SELECTOR), - string(name: 'PRINT_SERVER_RELEASE_REPO', value: PRINT_SERVER_RELEASE_REPO), - string(name: 'PRINT_SERVER_RELEASE_REVISION', value: PRINT_SERVER_RELEASE_REVISION), - string(name: 'ATLAS_SERVICES_ARTIFACT_LOCATION', value: ATLAS_SERVICES_ARTIFACT_LOCATION), - string(name: 'ATLAS_SERVICES_COMPILE_JOB', value: ATLAS_SERVICES_COMPILE_JOB), - string(name: 'ATLAS_SERVICES_BUILD_SELECTOR', value: ATLAS_SERVICES_BUILD_SELECTOR), - string(name: 'ATLAS_SERVICES_RELEASE_REPO', value: ATLAS_SERVICES_RELEASE_REPO), - string(name: 'ATLAS_SERVICES_RELEASE_REVISION', value: ATLAS_SERVICES_RELEASE_REVISION), - booleanParam(name: 'CLEAN_WORKSPACE', value: CLEAN_WORKSPACE), - ] - - if(atlas_pro_installer_job.result.equals("UNSTABLE") || atlas_pro_installer_job.result.equals("FAILURE")) - { - currentBuild.result = atlas_pro_installer_job.result - } - } - } - } - stage('Build Atlas SDK installers') { - steps { - script { - atlas_sdk_installer_job = build job: ATLAS_SDK_INSTALLER_BUILD_JOB - parameters: [ - string(name: 'SOURCE_REVISION', value: SOURCEREVISION), - string(name: 'ATLAS_UI_COMPILE_JOB', value: atlas_compile_job.getProjectName()), - string(name: 'ATLAS_UI_COMPILE_BUILD_SELECTOR', value: " ${atlas_compile_job.getNumber()}"), - string(name: 'PRINT_SERVER_ARTIFACT_LOCATION', value: PRINT_SERVER_ARTIFACT_LOCATION), - string(name: 'PRINT_SERVER_COMPILE_JOB', value: PRINT_SERVER_COMPILE_JOB), - string(name: 'PRINT_SERVER_BUILD_SELECTOR', value: PRINT_SERVER_BUILD_SELECTOR), - string(name: 'PRINT_SERVER_RELEASE_REPO', value: PRINT_SERVER_RELEASE_REPO), - string(name: 'PRINT_SERVER_RELEASE_REVISION', value: PRINT_SERVER_RELEASE_REVISION), - string(name: 'ATLAS_SERVICES_ARTIFACT_LOCATION', value: ATLAS_SERVICES_ARTIFACT_LOCATION), - string(name: 'ATLAS_SERVICES_COMPILE_JOB', value: ATLAS_SERVICES_COMPILE_JOB), - string(name: 'ATLAS_SERVICES_BUILD_SELECTOR', value: ATLAS_SERVICES_BUILD_SELECTOR), - string(name: 'ATLAS_SERVICES_RELEASE_REPO', value: ATLAS_SERVICES_RELEASE_REPO), - string(name: 'ATLAS_SERVICES_RELEASE_REVISION', value: ATLAS_SERVICES_RELEASE_REVISION), - booleanParam(name: 'CLEAN_WORKSPACE', value: CLEAN_WORKSPACE), - ] - - if(atlas_sdk_installer_job.result.equals("UNSTABLE") || atlas_sdk_installer_job.result.equals("FAILURE")) - { - currentBuild.result = atlas_sdk_installer_job.result - } - } - } - } stage('Build Ink UI installers') { steps { script { - ink_ui_installer_job = build job: INK_UI_INSTALLER_BUILD_JOB + modules_installer_job = build job: INK_UI_INSTALLER_BUILD_JOB parameters: [ string(name: 'SOURCE_REVISION', value: SOURCEREVISION), - string(name: 'ATLAS_UI_COMPILE_JOB', value: atlas_compile_job.getProjectName()), - string(name: 'ATLAS_UI_COMPILE_BUILD_SELECTOR', value: " ${atlas_compile_job.getNumber()}"), - string(name: 'INK_UI_COMPILE_JOB', value: ink_ui_compile_job.getProjectName()), - string(name: 'INK_UI_COMPILE_BUILD_SELECTOR', value: " ${ink_ui_compile_job.getNumber()}"), - string(name: 'PRINT_SERVER_ARTIFACT_LOCATION', value: PRINT_SERVER_ARTIFACT_LOCATION), - string(name: 'PRINT_SERVER_COMPILE_JOB', value: PRINT_SERVER_COMPILE_JOB), - string(name: 'PRINT_SERVER_BUILD_SELECTOR', value: PRINT_SERVER_BUILD_SELECTOR), - string(name: 'PRINT_SERVER_RELEASE_REPO', value: PRINT_SERVER_RELEASE_REPO), - string(name: 'PRINT_SERVER_RELEASE_REVISION', value: PRINT_SERVER_RELEASE_REVISION), - string(name: 'ATLAS_SERVICES_ARTIFACT_LOCATION', value: ATLAS_SERVICES_ARTIFACT_LOCATION), - string(name: 'ATLAS_SERVICES_COMPILE_JOB', value: ATLAS_SERVICES_COMPILE_JOB), - string(name: 'ATLAS_SERVICES_BUILD_SELECTOR', value: ATLAS_SERVICES_BUILD_SELECTOR), - string(name: 'ATLAS_SERVICES_RELEASE_REPO', value: ATLAS_SERVICES_RELEASE_REPO), - string(name: 'ATLAS_SERVICES_RELEASE_REVISION', value: ATLAS_SERVICES_RELEASE_REVISION), + string(name: 'ATLAS_CUSTOM_MODULES_COMPILE_JOB', value: modules_compile_job.getProjectName()), + string(name: 'ATLAS_CUSTOM_MODULES_COMPILE_JOB_SELECTOR', value: " ${modules_compile_job.getNumber()}"), booleanParam(name: 'CLEAN_WORKSPACE', value: CLEAN_WORKSPACE), ] - - if(ink_ui_installer_job.result.equals("UNSTABLE") || ink_ui_installer_job.result.equals("FAILURE")) - { - currentBuild.result = ink_ui_installer_job.result - } } } } @@ -215,16 +71,6 @@ pipeline { release_notes_job = build job: RELEASE_NOTES_JOB, parameters: [ string(name: 'SOURCE_REVISION', value: SOURCEREVISION), - string(name: 'PRINT_SERVER_ARTIFACT_LOCATION', value: PRINT_SERVER_ARTIFACT_LOCATION), - string(name: 'PRINT_SERVER_COMPILE_JOB', value: PRINT_SERVER_COMPILE_JOB), - string(name: 'PRINT_SERVER_BUILD_SELECTOR', value: PRINT_SERVER_BUILD_SELECTOR), - string(name: 'PRINT_SERVER_RELEASE_REPO', value: PRINT_SERVER_RELEASE_REPO), - string(name: 'PRINT_SERVER_RELEASE_REVISION', value: PRINT_SERVER_RELEASE_REVISION), - string(name: 'ATLAS_SERVICES_ARTIFACT_LOCATION', value: ATLAS_SERVICES_ARTIFACT_LOCATION), - string(name: 'ATLAS_SERVICES_COMPILE_JOB', value: ATLAS_SERVICES_COMPILE_JOB), - string(name: 'ATLAS_SERVICES_BUILD_SELECTOR', value: ATLAS_SERVICES_BUILD_SELECTOR), - string(name: 'ATLAS_SERVICES_RELEASE_REPO', value: ATLAS_SERVICES_RELEASE_REPO), - string(name: 'ATLAS_SERVICES_RELEASE_REVISION', value: ATLAS_SERVICES_RELEASE_REVISION), booleanParam(name: 'CLEAN_WORKSPACE', value: CLEAN_WORKSPACE), ] } @@ -238,57 +84,14 @@ pipeline { artifacthelper = load("${autobuilder.commonscripts()}/artifacts/metaexport.groovy") subJobs = [ // Sub-job variable, Artifact folder Increment Version Number - [ atlas_compile_job, "atlas_binaries", false, ], - [ ink_ui_compile_job, "ink_ui_binaries", false, ], - [ atlas_pro_installer_job, "atlas_pro_installers", false, ], - [ atlas_sdk_installer_job, "atlas_sdk_installer", false, ], - [ ink_ui_installer_job, "ink_ui_installers", false, ], + [ modules_compile_job, "module_binaries", false, ], + [ modules_installer_job, "module_installers", false, ], [ release_notes_job, "release_notes", false, ], ] artifactFolders = artifacthelper.combineSubjobArtifacts(meta, importer, subJobs) } } } - stage('Check installers for consistency') { - steps { - script { - def mfs = autobuilder.getmetafolderscript() - - echo "Checking meta data for version consistency." - - def atlasmeta = mfs.metafromfolder("atlas_binaries") - def atlasrevision = atlasmeta.buildstampinfo.revision - echo "Atlas meta has revision ${atlasrevision}." - - def proinstallmeta = mfs.metafromfolder("atlas_pro_installers") - def proinstallrevision = proinstallmeta.buildstampinfo.revision - echo "Pro installer meta has revision ${proinstallrevision}." - - def sdkinstallmeta = mfs.metafromfolder("atlas_sdk_installer") - def sdkinstallrevision = sdkinstallmeta.buildstampinfo.revision - echo "SDK installer meta has revision ${sdkinstallrevision}." - - def inkinstallmeta = mfs.metafromfolder("ink_ui_installers") - def inkinstallrevision = inkinstallmeta.buildstampinfo.revision - echo "Ink installer meta has revision ${inkinstallrevision}." - - if(atlasrevision != proinstallrevision) { - echo "A git check-in has been made during the pipeline (Atlas compile revision: ${atlasrevision} does not equal Professional Installer revison: ${proinstallrevision}) so marking build UNSTABLE" - currentBuild.result = 'UNSTABLE' - } - - if(atlasrevision != sdkinstallrevision) { - echo "A git check-in has been made during the pipeline (Atlas compile revision: ${atlasrevision} does not equal SDK Installer revison: ${sdkinstallrevision}) so marking build UNSTABLE" - currentBuild.result = 'UNSTABLE' - } - - if(atlasrevision != inkinstallrevision) { - echo "A git check-in has been made during the pipeline (Atlas compile revision: ${atlasrevision} does not equal Ink Installer revison: ${inkinstallrevision}) so marking build UNSTABLE" - currentBuild.result = 'UNSTABLE' - } - } - } - } stage('Classifying publishable artifacts') { steps { script { diff --git a/compile/compile.groovy b/compile/compile.groovy index e133071..1f380c4 100644 --- a/compile/compile.groovy +++ b/compile/compile.groovy @@ -12,19 +12,6 @@ pipeline { steps { script { configurationhelper = autobuilder.configurationhelper() - - PYTHONURL = 'git@hydra:tools/python.git' - PYTHONBRANCH = 'origin/3.6.3_windows' - PYTHONDIR = "${WORKSPACE}/python" - PYTHONROOTDIR = 'python' - configurationhelper.gitCheckoutAndRegister(meta, 'python', PYTHONURL, PYTHONBRANCH, PYTHONDIR, PYTHONROOTDIR) - env.PYTHON = "${PYTHONDIR}/ver/python.exe" - - VERSTAMPINGURL = 'git@hydra:releases/ver_stamping_releases.git' - VERSTAMPINGREVISION = "refs/tags/${VERSION_STAMPING_VERSION}" - VERSTAMPINGDIR = "${WORKSPACE}/ver_stamping" - VERSTAMPINGROOTDIR = 'ver_stamping_releases' - configurationhelper.gitCheckoutAndRegister(meta, 'Version stamping', VERSTAMPINGURL, VERSTAMPINGREVISION, VERSTAMPINGDIR, VERSTAMPINGROOTDIR) } } } @@ -76,6 +63,7 @@ pipeline { steps { script { importer = load("${autobuilder.commonscripts()}/import/importer.groovy") + def importoptions = importer.getNewImportOptions() importoptions.source(ATLAS_UI_ARTIFACT_LOCATION, ATLAS_UI_COMPILE_JOB,