Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Ubuntu 16.04 images for mininet-ovs-25
[releng/builder.git]
/
jjb
/
integration
/
integration-set-variables.sh
diff --git
a/jjb/integration/integration-set-variables.sh
b/jjb/integration/integration-set-variables.sh
index 93cd0eb99537f42d0dc0843d20915cb8b354d765..afb76221d484f840834a04884cb278e1a0108c97 100644
(file)
--- a/
jjb/integration/integration-set-variables.sh
+++ b/
jjb/integration/integration-set-variables.sh
@@
-1,3
+1,4
@@
+#!/bin/bash
if [[ "$KARAF_VERSION" == "odl" ]]; then
KARAF_ARTIFACT="opendaylight"
if [[ "$KARAF_VERSION" == "odl" ]]; then
KARAF_ARTIFACT="opendaylight"
@@
-7,7
+8,10
@@
else
KARAF_ARTIFACT="karaf"
fi
KARAF_ARTIFACT="karaf"
fi
-if [ "$JDKVERSION" == 'openjdk8' ]; then
+if [ "$JDKVERSION" == 'openjdk11' ]; then
+ echo "Preparing for JRE Version 11"
+ JAVA_HOME="/opt/jdk-11"
+elif [ "$JDKVERSION" == 'openjdk8' ]; then
echo "Preparing for JRE Version 8"
JAVA_HOME="/usr/lib/jvm/java-1.8.0"
elif [ "$JDKVERSION" == 'openjdk7' ]; then
echo "Preparing for JRE Version 8"
JAVA_HOME="/usr/lib/jvm/java-1.8.0"
elif [ "$JDKVERSION" == 'openjdk7' ]; then