From 692d73699492954cb9d1d0161c8410bb8b44e00f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 24 Oct 2020 17:50:58 +0100 Subject: [PATCH] Stop using deprecated script api --- compile/compile.groovy | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/compile/compile.groovy b/compile/compile.groovy index e25773d..e13b76c 100644 --- a/compile/compile.groovy +++ b/compile/compile.groovy @@ -76,46 +76,46 @@ pipeline { steps { script { importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - libmeta = importer.artifactimport(meta, - ATLAS_UI_ARTIFACT_LOCATION, - ATLAS_UI_COMPILE_JOB, - ATLAS_UI_BUILD_SELECTOR, - ATLAS_UI_RELEASE_REPO, - ATLAS_UI_RELEASE_REVISION, - AULIB, - false) + def importoptions = importer.getNewImportOptions() + importoptions.source(ATLAS_UI_ARTIFACT_LOCATION, + ATLAS_UI_COMPILE_JOB, + ATLAS_UI_BUILD_SELECTOR, + ATLAS_UI_RELEASE_REPO, + ATLAS_UI_RELEASE_REVISION) + importoptions.setincrementversionnumber(false) + libmeta = importer.artifactimport(meta, importoptions, AULIB) } } } stage('Import Print server to adjust version number') { steps { script { - def psartifactfiles = "meta/**" - psmeta = importer.artifactimport(meta, - PRINT_SERVER_ARTIFACT_LOCATION, - PRINT_SERVER_COMPILE_JOB, - PRINT_SERVER_BUILD_SELECTOR, - PRINT_SERVER_RELEASE_REPO, - PRINT_SERVER_RELEASE_REVISION, - PSBIN, - true, - psartifactfiles) // This should increment the version number + 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, PSBIN) } } } stage('Import Atlas services to adjust version number') { steps { script { - def asartifactfiles = "meta/**" - asmeta = importer.artifactimport(meta, - ATLAS_SERVICES_ARTIFACT_LOCATION, - ATLAS_SERVICES_COMPILE_JOB, - ATLAS_SERVICES_BUILD_SELECTOR, - ATLAS_SERVICES_RELEASE_REPO, - ATLAS_SERVICES_RELEASE_REVISION, - ASBIN, - true, - asartifactfiles) + 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) + asmeta = importer.artifactimport(meta, importoptions, ASBIN) } } } @@ -123,7 +123,7 @@ pipeline { steps { script { env.BUILD_STAMP=meta.buildstampinfo.buildstamp - env.BUILD_DATE=meta.jenkinsbuildinfo.builddate + env.BUILD_DATE=meta.jenkinsbuildinfo.builddate env.AS_PACKAGE_VERSION=asmeta.buildstampinfo.buildstamp bat """ call "${JOBSCRIPTS_COMMON}\\version_files.bat"