Repository: incubator-brooklyn Updated Branches: refs/heads/master 29936339f -> e92dd1ef4
Fix mysql download URL for integration tests Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a43bb6f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a43bb6f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a43bb6f9 Branch: refs/heads/master Commit: a43bb6f90a42dabbcea1a5e463592b7667fdbf54 Parents: 6212d19 Author: Thomas Bouron <[email protected]> Authored: Mon Aug 31 14:47:59 2015 +0100 Committer: Thomas Bouron <[email protected]> Committed: Thu Sep 3 09:14:59 2015 +0100 ---------------------------------------------------------------------- .../base/test/mysql/DynamicToyMySqlEntityBuilder.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a43bb6f9/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java index 65baf9a..c26b01b 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java @@ -70,8 +70,7 @@ public class DynamicToyMySqlEntityBuilder { // download String version = "5.5.37"; String osTag = getOsTag(e); - String mirrorUrl = "http://www.mirrorservice.org/sites/ftp.mysql.com/";; - return "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-"+version+"-"+osTag+".tar.gz/from/"+mirrorUrl; + return "http://cdn.mysql.com/archives/mysql-5.5/mysql-"+version+"-"+osTag+".tar.gz";; } public static final String installDir(Entity e, boolean isLocalhost) { @@ -88,18 +87,15 @@ public class DynamicToyMySqlEntityBuilder { public static String getOsTag(Entity e) { // e.g. "osx10.6-x86_64"; see http://www.mysql.com/downloads/mysql/#downloads OsDetails os = ((SshMachineLocation)Iterables.getOnlyElement(e.getLocations())).getOsDetails(); - if (os == null) return "linux-glibc2.5-x86_64"; + if (os == null) return "linux2.6-x86_64"; if (os.isMac()) { - String osp1 = os.getVersion()==null ? "osx10.8" //lowest common denominator - : new ComparableVersion(os.getVersion()).isGreaterThanOrEqualTo(OsVersions.MAC_10_9) ? "osx10.9" - : "osx10.8"; //lowest common denominator if (!os.is64bit()) { throw new IllegalStateException("Only 64 bit MySQL build is available for OS X"); } - return osp1+"-x86_64"; + return "osx10.6-x86_64"; } //assume generic linux - String osp1 = "linux-glibc2.5"; + String osp1 = "linux2.6"; String osp2 = os.is64bit() ? "x86_64" : "i686"; return osp1+"-"+osp2; }
