Stop using deprecated script api

This commit is contained in:
Dan Hawkins 2020-10-24 17:50:58 +01:00
commit 692d736994

View file

@ -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"