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
Merge "Updating cryptography to 2.9.0 paramiko 2.7.1 has requirement for cryptography...
[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 90210ebb3527653bd68da5b3566a09f8d1d020ae..76e8d726321eb8487926a30f686edb567730a4c6 100644
(file)
--- a/
jjb/integration/integration-set-variables.sh
+++ b/
jjb/integration/integration-set-variables.sh
@@
-1,16
+1,19
@@
+#!/bin/bash
-if [[ "$KARAF_VERSION" == "karaf3" ]]; then
+if [[ "$KARAF_VERSION" == "odl" ]]; then
+ KARAF_ARTIFACT="opendaylight"
+elif [[ "$KARAF_VERSION" == "karaf3" ]]; then
KARAF_ARTIFACT="distribution-karaf"
else
KARAF_ARTIFACT="karaf"
fi
KARAF_ARTIFACT="distribution-karaf"
else
KARAF_ARTIFACT="karaf"
fi
-if [ "$JDKVERSION" == 'openjdk8' ]; then
+if [ "$JDKVERSION" == 'openjdk11' ]; then
+ echo "Preparing for JRE Version 11"
+ JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
+elif [ "$JDKVERSION" == 'openjdk8' ]; then
echo "Preparing for JRE Version 8"
JAVA_HOME="/usr/lib/jvm/java-1.8.0"
echo "Preparing for JRE Version 8"
JAVA_HOME="/usr/lib/jvm/java-1.8.0"
-elif [ "$JDKVERSION" == 'openjdk7' ]; then
- echo "Preparing for JRE Version 7"
- JAVA_HOME="/usr/lib/jvm/java-1.7.0"
fi
echo "Karaf artifact is ${KARAF_ARTIFACT}"
fi
echo "Karaf artifact is ${KARAF_ARTIFACT}"