diff --git a/Jenkinsfile b/Jenkinsfile index 3977bce..507c945 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,16 +4,16 @@ pipeline { buildDiscarder(logRotator(numToKeepStr: '2', artifactNumToKeepStr: '1')) } stages { - stage("Parallel Hello") { + stage("Image Configs") { matrix { axes { axis { name 'ImgRelease' - values '3.13 edge' + values '3.13,edge' } axis { name 'ImgVariant' - values 'default extended' + values 'default,extended' } } excludes { @@ -40,8 +40,9 @@ pipeline { steps { copyArtifacts filter: 'bin/distrobuilder', fingerprintArtifacts: true, flatten: true, projectName: '/Public/DistroBuilder/BuildConfig=BrampCustom', selector: lastSuccessful() // Build SH script - sh '''sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml ./ -o image.release=$ImgRelease -o image.variant=$ImgVariant - sudo chown jenkins:jenkins $WORKSPACE/*.tar.xz + sh ''' mkdir $WORKSPACE/REL + sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariant + sudo chown jenkins:jenkins -R $WORKSPACE/REL ''' } } @@ -50,7 +51,7 @@ pipeline { // Save generated files archiveArtifacts artifacts: '*.tar.xz', followSymlinks: false // Cleaning WorkSpace - cleanWs() + //cleanWs() } } }