mirror of https://github.com/apache/jclouds.git
Issue 891: ubuntu and centos now work with openjdk
This commit is contained in:
parent
8ab1d7f26c
commit
7e6b419068
|
@ -65,7 +65,7 @@ import com.google.inject.Module;
|
||||||
*
|
*
|
||||||
* @author Adrian Cole
|
* @author Adrian Cole
|
||||||
*/
|
*/
|
||||||
@Test(groups = "live")
|
@Test(groups = "live", testName="StubComputeServiceIntegrationTest")
|
||||||
public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTest {
|
public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTest {
|
||||||
|
|
||||||
private static final ExecResponse EXEC_GOOD = new ExecResponse("", "", 0);
|
private static final ExecResponse EXEC_GOOD = new ExecResponse("", "", 0);
|
||||||
|
|
|
@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){
|
||||||
function ensure_cmd_or_install_package_yum(){
|
function ensure_cmd_or_install_package_yum(){
|
||||||
local cmd=$1
|
local cmd=$1
|
||||||
local pkg=$2
|
local pkg=$2
|
||||||
hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg
|
hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensure_netutils_apt() {
|
function ensure_netutils_apt() {
|
||||||
|
@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE
|
||||||
END_OF_JCLOUDS_FILE
|
END_OF_JCLOUDS_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
function installJDK() {
|
function installOpenJDK() {
|
||||||
if hash apt-get 2>/dev/null; then
|
if hash apt-get 2>/dev/null; then
|
||||||
export pkg=openjdk-7-jdk
|
export pkg=openjdk-7-jdk
|
||||||
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
||||||
elif hash yum 2>/dev/null; then
|
elif hash yum 2>/dev/null; then
|
||||||
export pkg=java-1.7.0-openjdk
|
#TODO: find a jdk7 yum repo
|
||||||
yum --nogpgcheck -y ensure $pkg
|
export pkg=java-1.6.0-openjdk-devel
|
||||||
|
yum --nogpgcheck -y install $pkg
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`
|
||||||
else
|
else
|
||||||
abort "we only support apt-get and yum right now... please contribute!"
|
abort "we only support apt-get and yum right now... please contribute!"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
|
||||||
ln -Fs $JAVA_HOME /usr/local/jdk
|
ln -Fs $JAVA_HOME /usr/local/jdk
|
||||||
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
||||||
setupJavaHomeInProfile
|
setupJavaHomeInProfile
|
||||||
|
|
|
@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){
|
||||||
function ensure_cmd_or_install_package_yum(){
|
function ensure_cmd_or_install_package_yum(){
|
||||||
local cmd=$1
|
local cmd=$1
|
||||||
local pkg=$2
|
local pkg=$2
|
||||||
hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg
|
hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensure_netutils_apt() {
|
function ensure_netutils_apt() {
|
||||||
|
@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE
|
||||||
END_OF_JCLOUDS_FILE
|
END_OF_JCLOUDS_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
function installJDK() {
|
function installOpenJDK() {
|
||||||
if hash apt-get 2>/dev/null; then
|
if hash apt-get 2>/dev/null; then
|
||||||
export pkg=openjdk-7-jdk
|
export pkg=openjdk-7-jdk
|
||||||
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
||||||
elif hash yum 2>/dev/null; then
|
elif hash yum 2>/dev/null; then
|
||||||
export pkg=java-1.7.0-openjdk
|
#TODO: find a jdk7 yum repo
|
||||||
yum --nogpgcheck -y ensure $pkg
|
export pkg=java-1.6.0-openjdk-devel
|
||||||
|
yum --nogpgcheck -y install $pkg
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`
|
||||||
else
|
else
|
||||||
abort "we only support apt-get and yum right now... please contribute!"
|
abort "we only support apt-get and yum right now... please contribute!"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
|
||||||
ln -Fs $JAVA_HOME /usr/local/jdk
|
ln -Fs $JAVA_HOME /usr/local/jdk
|
||||||
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
||||||
setupJavaHomeInProfile
|
setupJavaHomeInProfile
|
||||||
|
|
|
@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){
|
||||||
function ensure_cmd_or_install_package_yum(){
|
function ensure_cmd_or_install_package_yum(){
|
||||||
local cmd=$1
|
local cmd=$1
|
||||||
local pkg=$2
|
local pkg=$2
|
||||||
hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg
|
hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensure_netutils_apt() {
|
function ensure_netutils_apt() {
|
||||||
|
@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE
|
||||||
END_OF_JCLOUDS_FILE
|
END_OF_JCLOUDS_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
function installJDK() {
|
function installOpenJDK() {
|
||||||
if hash apt-get 2>/dev/null; then
|
if hash apt-get 2>/dev/null; then
|
||||||
export pkg=openjdk-7-jdk
|
export pkg=openjdk-7-jdk
|
||||||
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
||||||
elif hash yum 2>/dev/null; then
|
elif hash yum 2>/dev/null; then
|
||||||
export pkg=java-1.7.0-openjdk
|
#TODO: find a jdk7 yum repo
|
||||||
yum --nogpgcheck -y ensure $pkg
|
export pkg=java-1.6.0-openjdk-devel
|
||||||
|
yum --nogpgcheck -y install $pkg
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`
|
||||||
else
|
else
|
||||||
abort "we only support apt-get and yum right now... please contribute!"
|
abort "we only support apt-get and yum right now... please contribute!"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
|
||||||
ln -Fs $JAVA_HOME /usr/local/jdk
|
ln -Fs $JAVA_HOME /usr/local/jdk
|
||||||
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
||||||
setupJavaHomeInProfile
|
setupJavaHomeInProfile
|
||||||
|
|
|
@ -17,18 +17,20 @@ END_OF_JCLOUDS_FILE
|
||||||
END_OF_JCLOUDS_FILE
|
END_OF_JCLOUDS_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
function installJDK() {
|
function installOpenJDK() {
|
||||||
if hash apt-get 2>/dev/null; then
|
if hash apt-get 2>/dev/null; then
|
||||||
export pkg=openjdk-7-jdk
|
export pkg=openjdk-7-jdk
|
||||||
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
||||||
elif hash yum 2>/dev/null; then
|
elif hash yum 2>/dev/null; then
|
||||||
export pkg=java-1.7.0-openjdk
|
#TODO: find a jdk7 yum repo
|
||||||
yum --nogpgcheck -y ensure $pkg
|
export pkg=java-1.6.0-openjdk-devel
|
||||||
|
yum --nogpgcheck -y install $pkg
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`
|
||||||
else
|
else
|
||||||
abort "we only support apt-get and yum right now... please contribute!"
|
abort "we only support apt-get and yum right now... please contribute!"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
|
||||||
ln -Fs $JAVA_HOME /usr/local/jdk
|
ln -Fs $JAVA_HOME /usr/local/jdk
|
||||||
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
||||||
setupJavaHomeInProfile
|
setupJavaHomeInProfile
|
||||||
|
|
|
@ -11,7 +11,7 @@ function ensure_cmd_or_install_package_apt(){
|
||||||
function ensure_cmd_or_install_package_yum(){
|
function ensure_cmd_or_install_package_yum(){
|
||||||
local cmd=$1
|
local cmd=$1
|
||||||
local pkg=$2
|
local pkg=$2
|
||||||
hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg
|
hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensure_netutils_apt() {
|
function ensure_netutils_apt() {
|
||||||
|
|
|
@ -96,7 +96,7 @@ function ensure_cmd_or_install_package_apt(){
|
||||||
function ensure_cmd_or_install_package_yum(){
|
function ensure_cmd_or_install_package_yum(){
|
||||||
local cmd=$1
|
local cmd=$1
|
||||||
local pkg=$2
|
local pkg=$2
|
||||||
hash $cmd 2>/dev/null || yum --nogpgcheck -y ensure $pkg
|
hash $cmd 2>/dev/null || yum --nogpgcheck -y install $pkg
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensure_netutils_apt() {
|
function ensure_netutils_apt() {
|
||||||
|
@ -152,18 +152,20 @@ END_OF_JCLOUDS_FILE
|
||||||
END_OF_JCLOUDS_FILE
|
END_OF_JCLOUDS_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
function installJDK() {
|
function installOpenJDK() {
|
||||||
if hash apt-get 2>/dev/null; then
|
if hash apt-get 2>/dev/null; then
|
||||||
export pkg=openjdk-7-jdk
|
export pkg=openjdk-7-jdk
|
||||||
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
apt-get-install $pkg || ( apt-get-upgrade && apt-get-install $pkg )
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
||||||
elif hash yum 2>/dev/null; then
|
elif hash yum 2>/dev/null; then
|
||||||
export pkg=java-1.7.0-openjdk
|
#TODO: find a jdk7 yum repo
|
||||||
yum --nogpgcheck -y ensure $pkg
|
export pkg=java-1.6.0-openjdk-devel
|
||||||
|
yum --nogpgcheck -y install $pkg
|
||||||
|
export JAVA_HOME=`ls -d /usr/lib/jvm/java-1.6.0-openjdk-*`
|
||||||
else
|
else
|
||||||
abort "we only support apt-get and yum right now... please contribute!"
|
abort "we only support apt-get and yum right now... please contribute!"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
JAVA_HOME=`ls -d /usr/lib/jvm/java-7-openjdk-*|grep -v common`
|
|
||||||
ln -Fs $JAVA_HOME /usr/local/jdk
|
ln -Fs $JAVA_HOME /usr/local/jdk
|
||||||
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
/usr/local/jdk/bin/java -version || abort "cannot run java"
|
||||||
setupJavaHomeInProfile
|
setupJavaHomeInProfile
|
||||||
|
|
Loading…
Reference in New Issue