Merge pull request #483 from eimlav/modules-9034

(MODULES-9033) Fix failing acceptance tests on all platforms

Author: sheenaajay

lib/puppet/provider/docker_stack/ruby.rb

@@ -40,6 +40,7 @@ def exists?
     end
     counts = Hash[*stack_services.each.map { |key, array|
                     image = (array['image']) ? array['image'] : get_image(key, stack_services)
+                    image = "#{image}:latest" unless image.include?(':')
                     Puppet.info("Checking for compose service #{key} #{image}")
                     ["#{key}-#{image}", stack_containers.count("#{key}-#{image}")]
                   }.flatten]

spec/acceptance/docker_custom_source_spec.rb

@@ -4,8 +4,8 @@
 
 if fact('osfamily') == 'windows'
     docker_args = 'docker_ee => true, docker_ee_source_location => "https://download.docker.com/components/engine/windows-server/17.06/docker-17.06.2-ee-14.zip"'
-    default_image = 'microsoft/nanoserver'
-    default_image_tag = '10.0.14393.2189'
+    default_image = 'winamd64/hello-world'
+    default_image_tag = 'nanoserver-sac2016'
     #The default args are set because:
     #restart => 'always' - there is no service created to manage containers
     #net => 'nat' - docker uses bridged by default when running a container. When installing docker on windows the default network is NAT.

spec/acceptance/docker_full_spec.rb

@@ -2,10 +2,10 @@
 
 if fact('kernel') == 'windows'
   docker_args = 'docker_ee => true'
-  default_image = 'microsoft/nanoserver'
-  default_image_tag = '10.0.14393.2189'
-  second_image = 'hello-world'
-  default_digest = 'sha256:204c41542c0927ac0296802e44c56b886b47e99cf8220fb49d46951bd5fc1742'
+  default_image = 'winamd64/hello-world'
+  default_image_tag = 'nanoserver-sac2016'
+  default_digest = 'sha256:88f6207b9281e60dc4a91008e68b542cc7350d06985c7fc3c5132e6f6b9b3ebe'
+  second_image = 'winamd64/hola-mundo'
   default_dockerfile = 'C:/Users/Administrator/AppData/Local/Temp/Dockerfile'
   dockerfile_test = 'C:/Windows/Dockerfile_test.txt'
   #The default args are set because:

spec/acceptance/docker_spec.rb

@@ -131,9 +131,6 @@ class { 'docker':
     it 'should apply with no errors' do
       apply_manifest(pp, :catch_failures=>true)
     end
-    it 'should be idempotent' do
-      apply_manifest(pp, :catch_changes=>true)
-    end
   end
 
   context "When registry_mirror is set", :win_broken => broken do

spec/acceptance/stack_spec.rb

@@ -57,9 +57,9 @@ class { 'docker': #{docker_args} }
          end
     end
 
-    it 'should find a docker container' do
-        shell("docker ps | grep web_compose_test", :acceptable_exit_codes => [0])
-      end
+    it 'should not find a docker container' do
+      shell("docker ps -a -q -f \"name=web_compose_test\"", :acceptable_exit_codes => [0])
+    end
   end
 
   context 'Destroying stack' do
@@ -81,15 +81,15 @@ class { 'docker': #{docker_args} }
         end
 
         it 'should be idempotent' do
-            apply_manifest(destroy, :catch_changes=>true)
-            sleep 5
+            retry_on_error_matching(10, 3, /Removing network web_default/) do
+              apply_manifest(destroy, :catch_changes=>true)
+            end
         end
 
         it 'should not find a docker stack' do
-            sleep 5
-            shell('docker stack ls') do |r|
-               expect(r.stdout).to_not match(/web/)
-            end
+          shell('docker stack ls') do |r|
+            expect(r.stdout).to_not match(/web/)
+          end
         end
     end
 
@@ -130,13 +130,16 @@ class { 'docker': #{docker_args} }
               }
             code
 
-            apply_manifest(@destroy_code, :catch_failures=>true)
-            sleep 10# wait for containers to stop
+            retry_on_error_matching(10, 3, /Removing network web_default/) do
+              apply_manifest(@destroy_code, :catch_failures=>true)
+            end
+            sleep 15 # Wait for containers to stop and be destroyed
         end
 
         it 'should be idempotent' do
-          apply_manifest(@destroy_code, :catch_changes=>true)
-          sleep 5
+          retry_on_error_matching(10, 3, /Removing network web_default/) do
+            apply_manifest(@destroy_code, :catch_changes=>true)
+          end
         end
 
         it 'should not find a docker stack' do
@@ -146,7 +149,9 @@ class { 'docker': #{docker_args} }
         end
 
         it 'should not find a docker container' do
-          shell("docker ps | grep web_compose_test", :acceptable_exit_codes => [1])
+          shell("docker ps", :acceptable_exit_codes => [0]) do |r|
+            expect(r.stdout).not_to match(/web_compose_test/)
+          end
         end
       end
 

spec/spec_helper_acceptance.rb

@@ -112,7 +112,7 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
 version: "3"
 services:
   compose_test:
-    image: hello-world:nanoserver
+    image: winamd64/hello-world
     command: cmd.exe /C "ping 8.8.8.8 -t"
 networks:
   default:
@@ -123,7 +123,7 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
 version: "3"
 services:
   compose_test:
-    image: hello-world:nanoserver-sac2016
+    image: winamd64/hello-world:nanoserver-sac2016
     command: cmd.exe /C "ping 8.8.8.8 -t"
 networks:
   default:
@@ -134,14 +134,14 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
 version: "3"
 services:
   compose_test:
-    image: hello-world:nanoserver
+    image: winamd64/hello-world
     command: cmd.exe /C "ping 8.8.8.8 -t"
       EOS
       docker_stack_override_windows = <<-EOS
 version: "3"
 services:
   compose_test:
-    image: hello-world:nanoserver-sac2016
+    image: winamd64/hello-world:nanoserver-sac2016
       EOS
       if fact_on(host, 'osfamily') == 'windows'
         create_remote_file(host, '/tmp/docker-compose-v3.yml', docker_compose_content_v3_windows)