diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml index 5e16e60389..248b9b1c4e 100644 --- a/apis/chef/pom.xml +++ b/apis/chef/pom.xml @@ -97,4 +97,21 @@ true + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + + diff --git a/apis/chef/src/main/resources/org/jclouds/chef/statements/install-chef-gems.sh b/apis/chef/src/main/resources/org/jclouds/chef/statements/install-chef-gems.sh index 98524d477b..1aa3d788d5 100755 --- a/apis/chef/src/main/resources/org/jclouds/chef/statements/install-chef-gems.sh +++ b/apis/chef/src/main/resources/org/jclouds/chef/statements/install-chef-gems.sh @@ -1,8 +1,6 @@ if [ ! -f /usr/bin/chef-client ]; then - apt-get update -o Acquire::http::No-Cache=True + apt-get update apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras - # Comment next line for production controlled environments, this should be part of a recipe - apt-get -y upgrade ( mkdir -p /tmp/bootchef cd /tmp/bootchef diff --git a/apis/chef/src/test/resources/one-recipe.sh b/apis/chef/src/test/resources/one-recipe.sh index 5e53346a67..e3185677e0 100755 --- a/apis/chef/src/test/resources/one-recipe.sh +++ b/apis/chef/src/test/resources/one-recipe.sh @@ -1,17 +1,16 @@ if [ ! -f /usr/bin/chef-client ]; then apt-get update apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras - mkdir -p /tmp/bootchef ( - cd /tmp/bootchef - wget http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz - tar xvf rubygems-1.3.6.tgz - cd rubygems-1.3.6 - ruby setup.rb - cp /usr/bin/gem1.8 /usr/bin/gem + mkdir -p /tmp/bootchef + cd /tmp/bootchef + wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz + tar zxf rubygems-1.3.7.tgz + cd rubygems-1.3.7 + ruby setup.rb --no-format-executable + rm -fr /tmp/bootchef ) - rm -rf /tmp/bootchef - gem install chef ohai --no-rdoc --no-ri --verbose + /usr/bin/gem install ohai chef --no-rdoc --no-ri --verbose fi mkdir -p /etc/chef cat >> /etc/chef/client.rb <<'END_OF_FILE'