LM
/
yocto-img-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jenkins: added image type argument to archive different images in one job 

BugzID: 73966
Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2021-07-29 08:55:31 +02:00
parent 88508cb44e
commit daca933bfd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile_Common
View File

@ -115,9 +115,9 @@ def cleanupDistroVersion() {
} }
def archiveImages(imgageDir) { def archiveImages(imgageDir, imgType) {
dir ('tmp/artifacts') { dir ('tmp/artifacts') {
zip archive: true, dir: "${WORKSPACE}/${imgageDir}", glob: "*", zipFile: "${env.PACKAGE_NAME}-${env.BUILD_VERSION}-${params.MACHINE}-${params.IMAGE_TYPE}.zip" zip archive: true, dir: "${WORKSPACE}/${imgageDir}", glob: "*", zipFile: "${env.PACKAGE_NAME}-${env.BUILD_VERSION}-${params.MACHINE}-${imgType}.zip"
} }
sh "rm -rf ${WORKSPACE}/tmp" sh "rm -rf ${WORKSPACE}/tmp"
} }

2
Jenkinsfile_RamdiskImages
View File

@ -79,7 +79,7 @@ pipeline {
script { script {
build(params.IMAGE_TYPE, params.IMAGE_TYPE) build(params.IMAGE_TYPE, params.IMAGE_TYPE)
createArchive(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR) createArchive(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR)
yoctocommon.archiveImages(env.IMG_OUTPUT_DIR) yoctocommon.archiveImages(env.IMG_OUTPUT_DIR, params.IMAGE_TYPE)
} }
} }
post { post {

4
Jenkinsfile_mmcImages
View File

@ -83,7 +83,7 @@ pipeline {
// the bootloader is also built with the dev image, hence we combine it // the bootloader is also built with the dev image, hence we combine it
if((params.IMAGE_TYPE == 'bootloader') || (params.IMAGE_TYPE == 'dev')) { if((params.IMAGE_TYPE == 'bootloader') || (params.IMAGE_TYPE == 'dev')) {
createBslPackage(env.IMG_OUTPUT_DIR) createBslPackage(env.IMG_OUTPUT_DIR)
yoctocommon.archiveImages(env.IMG_OUTPUT_DIR) yoctocommon.archiveImages(env.IMG_OUTPUT_DIR, 'bootloader')
} }
// archive an image package: // archive an image package:
@ -91,7 +91,7 @@ pipeline {
if(params.IMAGE_TYPE != 'bootloader') { if(params.IMAGE_TYPE != 'bootloader') {
createImagePackage(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR) createImagePackage(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR)
archiveOSTreeArtifact(env.IMG_OUTPUT_DIR) archiveOSTreeArtifact(env.IMG_OUTPUT_DIR)
yoctocommon.archiveImages(env.IMG_OUTPUT_DIR) yoctocommon.archiveImages(env.IMG_OUTPUT_DIR, params.IMAGE_TYPE)
} }
} }
} }