pdqtest 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b17488530a2a8adcfe4c2a923d10613515bf5d7447078c97587a3c0c907e011
-  data.tar.gz: e1a9553a36e8be6bcc51d34dd6c4ceb9b9473be2088229b36ea68c3962c73f52
+  metadata.gz: b31dcb07b28f856c67946e787ae6c7f738a80cd35094dca5e40945b5d583cb93
+  data.tar.gz: 8414386c5b910112ed305524e81fa333bca8f0b7c7def8a1af773d259460b921
 SHA512:
-  metadata.gz: b02cf93cedb23d5b1a47aa257e09328e89e6a157dd61eabafe8829462300725e6caea517fc7a6be7e6ffc5724ca867b37ed64428749dfc4c6dd721fb786eb968
-  data.tar.gz: 3045966e2fec1c532ad4e5451f1fea9968c1fa50de10eb2d169fffb49bb958cc50a1c6e3d5f5aba7894a3595557f96e978d5dc676444c369ba62a1b543482669
+  metadata.gz: 925cf675abe919ae5b63a95be161b27e9d087011480cae06c094b1c07a435a7e59af7e9bc5644255449c9657dc78cdb40bab19c25d935027d5355aa7e0914b5d
+  data.tar.gz: 51dfde1ed0ffb94309f95c43cf9152f80f534fd7ac6ac600e3d0869ed65d28d5683642373307963a89a6a365d87a636970e6a4033662d3ca5f3c25a9bee8c1ce

data/doc/acceptance_tests.md

@@ -91,3 +91,8 @@ pdqtest --keep-container all
 * Keeps the container Running
 * After testing, the container used to run tests will be left running and a message will be printed showing how to enter the container used for testing.  Your code is avaiable at `/testcase`
 * User is responsible for cleaning up the containers created in this mode
+
+### Docker privileged mode
+Sometimes you need to run in Docker privileged mode to enable tests to work - not ideal and if anyone else has a better idea please open a ticket with the details. When privileged mode is required, run `pdqtest --privileged` and you will have access.
+
+WARNING: This grants the container access to the host

data/exe/pdqtest

@@ -57,6 +57,13 @@ Escort::App.create do |app|
       :default  => false,
     )
 
+    opts.opt(:privileged,
+      'Run docker containers in privileged mode',
+      :long     => '--privileged',
+      :type     => :boolean,
+      :default  => false,
+    )
+
   end
 
   app.command :all do |command|
@@ -66,6 +73,7 @@ Escort::App.create do |app|
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
       PDQTest::Puppet.skip_second_run(options[:global][:options][:skip_idempotency])
 
+      PDQTest::Instance.set_privileged(options[:global][:options][:privileged])
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
 
@@ -102,6 +110,7 @@ Escort::App.create do |app|
     command.action do |options, arguments|
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
       PDQTest::Puppet.skip_second_run(options[:global][:options][:skip_idempotency])
+      PDQTest::Instance.set_privileged(options[:global][:options][:privileged])
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
       example = options[:global][:commands][:acceptance][:options][:example]

data/lib/pdqtest/docker.rb

@@ -60,7 +60,7 @@ module PDQTest
       supported_images.uniq
     end
 
-    def self.new_container(test_dir, image_name)
+    def self.new_container(test_dir, image_name, privileged)
       pwd = Dir.pwd
       hiera_yaml_host = File.join(pwd, HIERA_YAML_HOST)
       hiera_dir = File.join(pwd, HIERA_DIR)
@@ -113,6 +113,7 @@ module PDQTest
               '/run/lock' => '',
             },
             CapAdd: [ 'SYS_ADMIN'],
+            Privileged: privileged,
           },
         }
       )

data/lib/pdqtest/instance.rb

@@ -9,6 +9,7 @@ module PDQTest
     @@keep_container = false
     @@active_container = nil
     @@image_name = false
+    @@privileged = false
 
     def self.get_active_container
       @@active_container
@@ -31,6 +32,14 @@ module PDQTest
           end
     end
 
+    def self.set_privileged(privileged)
+      @@privileged = privileged
+    end
+
+    def self.get_privileged
+      @@privileged
+    end
+
     def self.run(example=nil)
       # needed to prevent timeouts from container.exec()
       Excon.defaults[:write_timeout] = 10000
@@ -48,7 +57,7 @@ module PDQTest
         Escort::Logger.output.puts "Acceptance test on #{test_platforms}..."
         test_platforms.each { |image_name|
           Escort::Logger.output.puts "--- start test with #{image_name} ---"
-          @@active_container = PDQTest::Docker::new_container(TEST_DIR, image_name)
+          @@active_container = PDQTest::Docker::new_container(TEST_DIR, image_name, @@privileged)
           Escort::Logger.output.puts "alive, running tests"
           status &= PDQTest::Puppet.run(@@active_container, example)
 
@@ -72,7 +81,7 @@ module PDQTest
       # just list it with --image-name
       image_name = (@@image_name || Docker::acceptance_test_images).first
       Escort::Logger.output.puts "Opening a shell in #{image_name}"
-      @@active_container = PDQTest::Docker::new_container(TEST_DIR, image_name)
+      @@active_container = PDQTest::Docker::new_container(TEST_DIR, image_name, @@privileged)
 
       # In theory I should be able to get something like the code below to
       # redirect all input streams and give a makeshift interactive shell, howeve

data/lib/pdqtest/version.rb

@@ -1,4 +1,4 @@
 module PDQTest
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
   PUPPET_VERSION = "5.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler