Fix broken test jars.

Fix installchefgem script and test.
This commit is contained in:
Chris Custine 2011-05-23 01:54:14 -06:00
parent f5b8186962
commit e191018c32
3 changed files with 26 additions and 12 deletions

View File

@ -97,4 +97,21 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

View File

@ -1,8 +1,6 @@
if [ ! -f /usr/bin/chef-client ]; then 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 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 mkdir -p /tmp/bootchef
cd /tmp/bootchef cd /tmp/bootchef

View File

@ -1,17 +1,16 @@
if [ ! -f /usr/bin/chef-client ]; then if [ ! -f /usr/bin/chef-client ]; then
apt-get update apt-get update
apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras
mkdir -p /tmp/bootchef
( (
mkdir -p /tmp/bootchef
cd /tmp/bootchef cd /tmp/bootchef
wget http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
tar xvf rubygems-1.3.6.tgz tar zxf rubygems-1.3.7.tgz
cd rubygems-1.3.6 cd rubygems-1.3.7
ruby setup.rb ruby setup.rb --no-format-executable
cp /usr/bin/gem1.8 /usr/bin/gem rm -fr /tmp/bootchef
) )
rm -rf /tmp/bootchef /usr/bin/gem install ohai chef --no-rdoc --no-ri --verbose
gem install chef ohai --no-rdoc --no-ri --verbose
fi fi
mkdir -p /etc/chef mkdir -p /etc/chef
cat >> /etc/chef/client.rb <<'END_OF_FILE' cat >> /etc/chef/client.rb <<'END_OF_FILE'