From fd4fb98191a6e4ea598f3daefe7c798f5037be40 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Wed, 21 Dec 2011 02:14:27 -0800 Subject: [PATCH] updated tests to use jdk7u2 --- compute/src/test/java/org/jclouds/compute/RunScriptData.java | 2 +- compute/src/test/resources/initscript_with_java.sh | 2 +- compute/src/test/resources/initscript_with_jboss.sh | 2 +- compute/src/test/resources/runscript.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compute/src/test/java/org/jclouds/compute/RunScriptData.java b/compute/src/test/java/org/jclouds/compute/RunScriptData.java index f1c4f2cef4..8aa5cc8507 100644 --- a/compute/src/test/java/org/jclouds/compute/RunScriptData.java +++ b/compute/src/test/java/org/jclouds/compute/RunScriptData.java @@ -48,7 +48,7 @@ import com.google.common.collect.ImmutableSet; public class RunScriptData { public static final URI JDK7_URL = URI.create(System.getProperty("test.jdk7-url", - "http://download.oracle.com/otn-pub/java/jdk/7u1-b08/jdk-7u1-linux-x64.tar.gz")); + "http://download.oracle.com/otn-pub/java/jdk/7u2-b13/jdk-7u2-linux-x64.tar.gz")); public static final URI JBOSS7_URL = URI.create(System.getProperty("test.jboss7-url",// "http://download.jboss.org/jbossas/7.0/jboss-as-7.0.2.Final/jboss-as-web-7.0.2.Final.tar.gz")); diff --git a/compute/src/test/resources/initscript_with_java.sh b/compute/src/test/resources/initscript_with_java.sh index 8f1b61d0dd..898ff2455f 100644 --- a/compute/src/test/resources/initscript_with_java.sh +++ b/compute/src/test/resources/initscript_with_java.sh @@ -104,7 +104,7 @@ nslookup yahoo.com >/dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.c which curl >&- 2>&-|| apt-get install -f -y -qq --force-yes curl which nslookup >&- 2>&-|| apt-get install -f -y -qq --force-yes dnsutils mkdir -p /usr/local/jdk -curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://download.oracle.com/otn-pub/java/jdk/7u1-b08/jdk-7u1-linux-x64.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) +curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://download.oracle.com/otn-pub/java/jdk/7u2-b13/jdk-7u2-linux-x64.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) mv /usr/local/jdk1.7*/* /usr/local/jdk/ test -n "$SUDO_USER" && cat >> /home/$SUDO_USER/.bashrc <<'END_OF_FILE' diff --git a/compute/src/test/resources/initscript_with_jboss.sh b/compute/src/test/resources/initscript_with_jboss.sh index 5f37fe400c..5ffab24c6b 100644 --- a/compute/src/test/resources/initscript_with_jboss.sh +++ b/compute/src/test/resources/initscript_with_jboss.sh @@ -104,7 +104,7 @@ nslookup yahoo.com >/dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.c which curl >&- 2>&-|| apt-get install -f -y -qq --force-yes curl which nslookup >&- 2>&-|| apt-get install -f -y -qq --force-yes dnsutils mkdir -p /usr/local/jdk -curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://download.oracle.com/otn-pub/java/jdk/7u1-b08/jdk-7u1-linux-x64.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) +curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://download.oracle.com/otn-pub/java/jdk/7u2-b13/jdk-7u2-linux-x64.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) mv /usr/local/jdk1.7*/* /usr/local/jdk/ test -n "$SUDO_USER" && cat >> /home/$SUDO_USER/.bashrc <<'END_OF_FILE' diff --git a/compute/src/test/resources/runscript.sh b/compute/src/test/resources/runscript.sh index f9f55b2622..2d247070a4 100644 --- a/compute/src/test/resources/runscript.sh +++ b/compute/src/test/resources/runscript.sh @@ -83,7 +83,7 @@ nslookup yahoo.com >/dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.c which curl >&- 2>&-|| apt-get install -f -y -qq --force-yes curl which nslookup >&- 2>&-|| apt-get install -f -y -qq --force-yes dnsutils mkdir -p /usr/local/jdk -curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://download.oracle.com/otn-pub/java/jdk/7u1-b08/jdk-7u1-linux-x64.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) +curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://download.oracle.com/otn-pub/java/jdk/7u2-b13/jdk-7u2-linux-x64.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -) mv /usr/local/jdk1.7*/* /usr/local/jdk/ test -n "$SUDO_USER" && cat >> /home/$SUDO_USER/.bashrc <<'END_OF_FILE'