testlab 0.6.10 → 0.6.11

data/lib/testlab/container/lxc.rb

@@ -8,23 +8,29 @@ class TestLab
       # Renders the supplied content into a file on the container and proceeds
       # to execute it on the container as root.
       #
+      # On rare occasion it appears that the container will wipe '/tmp' after
+      # the bootstrap script is seeded but before it is executed via lxc-attach.
+      # This results in a 'No such file or directory' bash error when attempting
+      # to execute the script.  We allow 5 retries to seed the bootstrap script
+      # after which time the exception will be thrown and execution halted.
+      #
       # @param [String] content The content to render on the container and
       #   execute.  This is generally a bash script of some sort for example.
       # @return [String] The output of *lxc-attach*.
       def bootstrap(content)
         output = nil
 
-        ZTK::RescueRetry.try(:tries => 3, :on => ContainerError) do
+        ZTK::RescueRetry.try(:tries => 5, :on => ContainerError) do
           tempfile = Tempfile.new("bootstrap")
-          remote_tempfile = File.join("/tmp", File.basename(tempfile.path))
-          target_file = File.join(self.fs_root, remote_tempfile)
+          remote_tempfile = File.join("/", "tmp", File.basename(tempfile.path))
+          target_tempfile = File.join(self.fs_root, remote_tempfile)
 
-          self.node.ssh.file(:target => target_file, :chmod => '0777', :chown => 'root:root') do |file|
+          self.node.ssh.file(:target => target_tempfile, :chmod => '0777', :chown => 'root:root') do |file|
             file.puts(content)
           end
 
           output = self.lxc.attach(%(--), %(/bin/bash), remote_tempfile)
-          if output =~ /No such file or directory/
+          if !(output =~ /#{remote_tempfile}: No such file or directory/).nil?
             raise ContainerError, "We could not find the bootstrap file!"
           end
         end

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -42,7 +42,7 @@ class TestLab
           }
         }
 
-        apt_conf_d_proxy_file = File.join("/etc", "apt", "apt.conf.d", "00proxy")
+        apt_conf_d_proxy_file = File.join("/", "etc", "apt", "apt.conf.d", "00proxy")
         node.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
           file.puts(ZTK::Template.render(@apt_conf_d_proxy_file_template, context))
         end
@@ -60,17 +60,17 @@ class TestLab
 
         # Ensure the container APT calls use apt-cacher-ng on the node
         gateway_ip                     = container.primary_interface.network.ip
-        apt_conf_d_proxy_file          = File.join(container.fs_root, "etc", "apt", "apt.conf.d", "00proxy")
+        apt_conf_d_proxy_file          = File.join("/", "etc", "apt", "apt.conf.d", "00proxy")
 
         @config[:apt][:cacher_ng] = { :proxy_url => "http://#{gateway_ip}:3142" }.merge(@config[:apt][:cacher_ng])
 
-        container.node.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
+        container.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
           file.puts(ZTK::Template.render(@apt_conf_d_proxy_file_template, @config))
         end
 
         # Fix the APT sources since LXC mudges them when using apt-cacher-ng
-        apt_conf_sources_file = File.join(container.fs_root, "etc", "apt", "sources.list")
-        container.node.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
+        apt_conf_sources_file = File.join("/", "etc", "apt", "sources.list")
+        container.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
       end
 
     end

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "0.6.10"
+    VERSION = "0.6.11"
   end
 end

data/spec/provisioners/shell_spec.rb

@@ -41,16 +41,24 @@ describe TestLab::Provisioner::Shell do
       context "bootstrap successful" do
         it "should provision the container" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
+          subject.stub(:fs_root) { "/var/lib/lxc/#{subject.id}/rootfs" }
           subject.lxc.stub(:attach) { "" }
-          subject.provisioners.last.new(subject.config, @ui).on_container_setup(subject)
+
+          p = TestLab::Provisioner::Shell.new(subject.config, @ui)
+          p.on_container_setup(subject)
         end
       end
 
       context "bootstrap fails" do
         it "should raise an exception" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
-          subject.lxc.stub(:attach) { "No such file or directory" }
-          lambda{ subject.provisioners.last.new(subject.config, @ui).on_container_setup(subject) }.should raise_error TestLab::ContainerError
+          subject.stub(:fs_root) { "/var/lib/lxc/#{subject.id}/rootfs" }
+          subject.lxc.stub(:attach) do |arg0, arg1, arg2|
+            "#{arg2}: No such file or directory"
+          end
+
+          p = TestLab::Provisioner::Shell.new(subject.config, @ui)
+          lambda{ p.on_container_setup(subject) }.should raise_error TestLab::ContainerError
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -300,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3377457757681379174
+      hash: -168179665040294334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3377457757681379174
+      hash: -168179665040294334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25