diff --git a/Jenkinsfile b/Jenkinsfile index d1cc1c8..fc10e32 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,7 +66,7 @@ pipeline { // Build script catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { sh '''echo "$(date) Do Build for $ImgRelease - $ImgVariant" - ImgVariantName${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-} + ImgVariantName=${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-} sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariantName sudo chown jenkins:jenkins -R $WORKSPACE/REL mv $WORKSPACE/REL/$ImgRelease-$ImgVariant/rootfs.tar.xz $ImgVariant-$ImgRelease.tar.xz diff --git a/Jenkinsfile-Squential b/Jenkinsfile-Squential index 7567663..7f65b91 100644 --- a/Jenkinsfile-Squential +++ b/Jenkinsfile-Squential @@ -48,7 +48,7 @@ pipeline { stage('Build image') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { sh '''echo "$(date) Do Build for $ImgRelease - $ImgVariant" - ImgVariantName${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-} + ImgVariantName=${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-} sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariantName sudo chown jenkins:jenkins -R $WORKSPACE/REL mv $WORKSPACE/REL/$ImgRelease-$ImgVariant/rootfs.tar.xz $ImgVariant-$ImgRelease.tar.xz