Skip to content

Commit fd28d12

Browse files
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 fd28d12

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

Jenkinsfile

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ node(selector) {
1919
// our docker images
2020
def osImage
2121
def bldImage
22+
def pkgImage
2223

2324
// prepare run parameters
2425
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"
2627

2728
try {
2829
// clean and prepare
@@ -41,6 +42,7 @@ node(selector) {
4142
infoArg += " --build-arg BUILD_TYPE=\"${params.BUILD_TYPE}\""
4243
osImage = docker.build("ev3dev-lang-java:jdk-${params.BUILD_TYPE}-${params.DEBIAN}", "${infoArg} -f ${env.WORKSPACE}/system/Dockerfile.${params.BUILD_TYPE} ${env.WORKSPACE}/system")
4344
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")
4446
}
4547
stage("JDK download") {
4648
bldImage.inside("${mountParams} ${envParams}") {
@@ -65,17 +67,28 @@ node(selector) {
6567
archiveArtifacts artifacts: "build/jmods-${params.JDKPLATFORM_VALUE}.tar.gz", fingerprint: true
6668
}
6769

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+
6877
} finally {
6978
stage ('Cleanup') {
7079
// clean up workspace
80+
pkgImage.inside("${mountParams}") {
81+
try { sh "sudo rm -rf /build/*" } catch(err) {}
82+
}
7183
bldImage.inside("${mountParams}") {
7284
try { sh "sudo rm -rf /build/*" } catch(err) {}
7385
}
7486
try { sh "rm -rf ${env.WORKSPACE}/build" } catch(err) {}
7587

7688
// clean up docker images
89+
try { sh "docker rmi ${pkgImage.id} 2>/dev/null" } catch (err) {}
7790
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) {}
7992
cleanWs()
8093
}
8194
}

0 commit comments

Comments
 (0)