Skip to content

Commit 3a68737

Browse files
SiyaoIsHidingabsurdfarce
authored andcommitted
CASSANDRA-19568: Use Jabba to specify Java 1.8 for building the driver
patch by Jane He and Bret McGuire; reviewed by Bret McGuire for CASSANDRA-19568
1 parent b9760b4 commit 3a68737

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

Jenkinsfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,16 @@ ENVIRONMENT_EOF
9898
}
9999

100100
def buildDriver(jabbaVersion) {
101-
withEnv(["BUILD_JABBA_VERSION=${jabbaVersion}"]) {
102-
sh label: 'Build driver', script: '''#!/bin/bash -le
103-
. ${JABBA_SHELL}
104-
jabba use ${BUILD_JABBA_VERSION}
101+
def buildDriverScript = '''#!/bin/bash -le
105102
106-
mvn -B -V install -DskipTests -Dmaven.javadoc.skip=true
107-
'''
108-
}
103+
. ${JABBA_SHELL}
104+
jabba use '''+jabbaVersion+'''
105+
106+
echo "Building with Java version '''+jabbaVersion+'''
107+
108+
mvn -B -V install -DskipTests -Dmaven.javadoc.skip=true
109+
'''
110+
sh label: 'Build driver', script: buildDriverScript
109111
}
110112

111113
def executeTests() {
@@ -484,7 +486,7 @@ pipeline {
484486
}
485487
stage('Build-Driver') {
486488
steps {
487-
buildDriver('default')
489+
buildDriver('1.8')
488490
}
489491
}
490492
stage('Execute-Tests') {
@@ -600,8 +602,7 @@ pipeline {
600602
}
601603
stage('Build-Driver') {
602604
steps {
603-
// Jabba default should be a JDK8 for now
604-
buildDriver('default')
605+
buildDriver('1.8')
605606
}
606607
}
607608
stage('Execute-Tests') {

0 commit comments

Comments
 (0)