From 0e1e552b9dfffa8e9f79d75753fa317b0ac2faff Mon Sep 17 00:00:00 2001 From: Ignasi Barrera Date: Thu, 28 Feb 2013 21:03:55 +0100 Subject: [PATCH] There is no need to force the Chef version anymore --- .../jclouds/scriptbuilder/statements/chef/InstallChefGems.java | 2 +- .../org/jclouds/scriptbuilder/statements/chef/ChefSoloTest.java | 2 +- .../scriptbuilder/statements/chef/InstallChefGemsTest.java | 2 +- .../src/test/resources/test_install_chef_gems_scriptbuilder.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGems.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGems.java index 4da18d85da..9128588999 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGems.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGems.java @@ -34,7 +34,7 @@ public class InstallChefGems extends StatementList { public InstallChefGems() { // Chef versions prior to 10.16.4 install an incompatible moneta gem. // See: http://tickets.opscode.com/browse/CHEF-3721 - super(new InstallRuby(), exec("gem install chef -v '>= 10.16.4' --no-rdoc --no-ri")); + super(new InstallRuby(), exec("gem install chef --no-rdoc --no-ri")); } @Override diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/ChefSoloTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/ChefSoloTest.java index 8c64f336e6..8f423ba8a1 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/ChefSoloTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/ChefSoloTest.java @@ -382,7 +382,7 @@ public class ChefSoloTest { private static String installChefGems() throws IOException { return Resources.toString(Resources.getResource("test_install_ruby." + ShellToken.SH.to(OsFamily.UNIX)), - Charsets.UTF_8) + "gem install chef -v '>= 10.16.4' --no-rdoc --no-ri\n"; + Charsets.UTF_8) + "gem install chef --no-rdoc --no-ri\n"; } private static String createConfigFile() { diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGemsTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGemsTest.java index 9e05c1aece..2f9ad7df74 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGemsTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/chef/InstallChefGemsTest.java @@ -47,7 +47,7 @@ public class InstallChefGemsTest { assertEquals( new InstallChefGems().render(OsFamily.UNIX), Resources.toString(Resources.getResource("test_install_ruby." + ShellToken.SH.to(OsFamily.UNIX)), - Charsets.UTF_8) + "gem install chef -v '>= 10.16.4' --no-rdoc --no-ri\n"); + Charsets.UTF_8) + "gem install chef --no-rdoc --no-ri\n"); } public void installChefGemsUnixInScriptBuilderSourcesSetupPublicCurl() throws IOException { diff --git a/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh index e4fd15f77b..b96fa7695b 100644 --- a/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh +++ b/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh @@ -184,7 +184,7 @@ END_OF_JCLOUDS_SCRIPT gem update --system gem update --no-rdoc --no-ri - gem install chef -v '>= 10.16.4' --no-rdoc --no-ri + gem install chef --no-rdoc --no-ri END_OF_JCLOUDS_SCRIPT