Use non-deprecated methods for importing
This commit is contained in:
parent
523407f68f
commit
c985dcb552
5 changed files with 31 additions and 6 deletions
|
|
@ -11,7 +11,12 @@ def combineSubjobArtifacts(meta, importer, subJobs) {
|
|||
dir(destFolder) {
|
||||
deleteDir()
|
||||
}
|
||||
importer.artifactimport(meta, subJobName, subJobNumber, destFolder, incrementversionnumber)
|
||||
|
||||
def importoptions = importer.getNewImportOptions()
|
||||
importoptions.jenkinsjob(subJobName, subJobNumber)
|
||||
importoptions.setincrementversionnumber(incrementversionnumber)
|
||||
importer.artifactimport(meta, importoptions, destFolder)
|
||||
|
||||
artifactFolders.add("${destFolder}/**")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,10 @@ pipeline {
|
|||
stage('Copying embedded software artifacts') {
|
||||
steps {
|
||||
script {
|
||||
importer.artifactimport(meta, ESW_ARTIFACT_LOCATION, ESW_ARTIFACT_BUILD_JOB, ESW_ARTIFACT_BUILD_SELECTOR, ESW_ARTIFACT_RELEASE_REPO, ESW_ARTIFACT_RELEASE_REVISION, ESWDEST)
|
||||
def eswimportoptions = importer.getNewImportOptions()
|
||||
eswimportoptions.source(ESW_ARTIFACT_LOCATION, ESW_ARTIFACT_BUILD_JOB, ESW_ARTIFACT_BUILD_SELECTOR, ESW_ARTIFACT_RELEASE_REPO, ESW_ARTIFACT_RELEASE_REVISION)
|
||||
eswimportoptions.setincrementversionnumber(true)
|
||||
importer.artifactimport(meta, eswimportoptions, ESWDEST)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,9 @@ pipeline {
|
|||
stage('Import artifacts') {
|
||||
steps {
|
||||
script {
|
||||
importer.artifactimport(meta, ARTIFACT_LOCATION, ARTIFACT_PROJECT, ARTIFACT_BUILD_SELECTOR, RELEASE_REPO, RELEASE_REVISION, IMPORT)
|
||||
def importoptions = importer.getNewImportOptions()
|
||||
importoptions.source(ARTIFACT_LOCATION, ARTIFACT_PROJECT, ARTIFACT_BUILD_SELECTOR, RELEASE_REPO, RELEASE_REVISION)
|
||||
importer.artifactimport(meta, importoptions, IMPORT)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,8 +37,18 @@ pipeline {
|
|||
importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
|
||||
|
||||
SOURCEURL = TOP_LEVEL_META_REPOSITORY.trim()
|
||||
importer.artifactimport(meta, EARLY_SOURCE, EARLY_BUILD_JOB, EARLY_BUILD_SELECTOR, SOURCEURL, RELEASE_EARLY_REVISION, EARLYROOTDIR, false, 'meta/**')
|
||||
importer.artifactimport(meta, LATER_SOURCE, LATER_BUILD_JOB, LATER_BUILD_SELECTOR, SOURCEURL, RELEASE_LATER_REVISION, LATERROOTDIR, false, 'meta/**')
|
||||
|
||||
def earlyimportoptions = importer.getNewImportOptions()
|
||||
earlyimportoptions.source(EARLY_SOURCE, EARLY_BUILD_JOB, EARLY_BUILD_SELECTOR, SOURCEURL, RELEASE_EARLY_REVISION)
|
||||
earlyimportoptions.setincrementversionnumber(false)
|
||||
earlyimportoptions.setfilter('meta/**')
|
||||
importer.artifactimport(meta, earlyimportoptions, EARLYROOTDIR)
|
||||
|
||||
def laterimportoptions = importer.getNewImportOptions()
|
||||
laterimportoptions.source(LATER_SOURCE, LATER_BUILD_JOB, LATER_BUILD_SELECTOR, SOURCEURL, RELEASE_LATER_REVISION)
|
||||
laterimportoptions.setincrementversionnumber(false)
|
||||
laterimportoptions.setfilter('meta/**')
|
||||
importer.artifactimport(meta, laterimportoptions, LATERROOTDIR)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,12 @@ pipeline {
|
|||
steps {
|
||||
script {
|
||||
importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
|
||||
packagemeta = importer.artifactimport(meta, PACKAGE_CREATE_JOB, PACKAGE_CREATE_JOB_SELECTOR, PACKAGEDEST)
|
||||
|
||||
def packageimportoptions = importer.getNewImportOptions()
|
||||
packageimportoptions.jenkinsjob(PACKAGE_CREATE_JOB, PACKAGE_CREATE_JOB_SELECTOR)
|
||||
packageimportoptions.setincrementversionnumber(true)
|
||||
packagemeta = importer.artifactimport(meta, packageimportoptions, PACKAGEDEST)
|
||||
|
||||
PACKAGE_FOLDER = "${PACKAGEDEST}/package"
|
||||
UNIQUE_PACKAGE_FOLDER = "${PACKAGEDEST}/uniquepackage"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue