Commit fd28d12

committed

[pkg] feat: build debian packages on Jenkins

- previously, only JRI11 was publicly available as a .deb package - this extends it to all binary builds on AdoptOpenJDK Jenkins - this is a revert of 8f0650a

1 parent debc40a commit fd28d12Copy full SHA for fd28d12

File tree

1 file changed

+15

-2

lines changed

Jenkinsfile

1 file changed

+15

-2

lines changed

`‎Jenkinsfile‎`

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,11 @@ node(selector) {`
`19`	`19`	`// our docker images`
`20`	`20`	`def osImage`
`21`	`21`	`def bldImage`
	`22`	`+ def pkgImage`
`22`	`23`
`23`	`24`	`// prepare run parameters`
`24`	`25`	`String mountParams = "-v ${env.WORKSPACE}/build:/build"`
`25`		`- String envParams = "-e JDKVER=${params.JDKVER_VALUE} -e JDKVM=${params.JDKVM_VALUE} -e JDKPLATFORM=${params.JDKPLATFORM_VALUE} -e AUTOBUILD=1"`
	`26`	`+ String envParams = "-e JDKVER=${params.JDKVER_VALUE} -e JDKVM=${params.JDKVM_VALUE} -e JDKPLATFORM=${params.JDKPLATFORM_VALUE} -e AUTOBUILD=1 -e JAVA_PACKAGE_REVISION=-1"`
`26`	`27`
`27`	`28`	`try {`
`28`	`29`	`// clean and prepare`
`@@ -41,6 +42,7 @@ node(selector) {`
`41`	`42`	`infoArg += " --build-arg BUILD_TYPE=\"${params.BUILD_TYPE}\""`
`42`	`43`	`osImage = docker.build("ev3dev-lang-java:jdk-${params.BUILD_TYPE}-${params.DEBIAN}", "${infoArg} -f ${env.WORKSPACE}/system/Dockerfile.${params.BUILD_TYPE} ${env.WORKSPACE}/system")`
`43`	`44`	`bldImage = docker.build("ev3dev-lang-java:jdk-${params.BUILD_TYPE}-build", "${infoArg} ${env.WORKSPACE}/scripts")`
	`45`	`+ pkgImage = docker.build("ev3dev-lang-java:jdk-package", "${infoArg} ${env.WORKSPACE}/packaging")`
`44`	`46`	`}`
`45`	`47`	`stage("JDK download") {`
`46`	`48`	`bldImage.inside("${mountParams} ${envParams}") {`
`@@ -65,17 +67,28 @@ node(selector) {`
`65`	`67`	`archiveArtifacts artifacts: "build/jmods-${params.JDKPLATFORM_VALUE}.tar.gz", fingerprint: true`
`66`	`68`	`}`
`67`	`69`
	`70`	`+ stage("JDK debpkg") {`
	`71`	`+ pkgImage.inside("${mountParams} ${envParams}") {`
	`72`	`+ sh "/opt/jdkpkg/package.sh"`
	`73`	`+ }`
	`74`	`+ archiveArtifacts artifacts: "build/pkg/*", fingerprint: false`
	`75`	`+ }`
	`76`	`+`
`68`	`77`	`} finally {`
`69`	`78`	`stage ('Cleanup') {`
`70`	`79`	`// clean up workspace`
	`80`	`+ pkgImage.inside("${mountParams}") {`
	`81`	`+ try { sh "sudo rm -rf /build/*" } catch(err) {}`
	`82`	`+ }`
`71`	`83`	`bldImage.inside("${mountParams}") {`
`72`	`84`	`try { sh "sudo rm -rf /build/*" } catch(err) {}`
`73`	`85`	`}`
`74`	`86`	`try { sh "rm -rf ${env.WORKSPACE}/build" } catch(err) {}`
`75`	`87`
`76`	`88`	`// clean up docker images`
	`89`	`+ try { sh "docker rmi ${pkgImage.id} 2>/dev/null" } catch (err) {}`
`77`	`90`	`try { sh "docker rmi ${bldImage.id} 2>/dev/null" } catch (err) {}`
`78`		`- try { sh "docker rmi ${osImage.id} 2>/dev/null" } catch (err) {}`
	`91`	`+ try { sh "docker rmi ${osImage.id} 2>/dev/null" } catch (err) {}`
`79`	`92`	`cleanWs()`
`80`	`93`	`}`
`81`	`94`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit fd28d12

File tree

1 file changed

1 file changed

`‎Jenkinsfile‎`

0 commit comments