Update to latest version and fix idempotency issues

Signed-off-by: Lance Albertson <[email protected]>
gwynethallwright · Oct 17, 2020 · 3c7c9b3 · 3c7c9b3
1 parent 1f6874b
commit 3c7c9b3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -236,7 +236,7 @@ The `docker_installation_package` resource uses the system package manager to in
 
 ```ruby
 docker_installation_package 'default' do
-  version '19.03.8'
+  version '19.03.13'
   action :create
   package_options %q|--force-yes -o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-all'| # if Ubuntu for example
 end

diff --git a/kitchen.yml b/kitchen.yml
@@ -59,7 +59,7 @@ suites:
   - name: installation_package
     attributes:
       docker:
-        version: '19.03.8'
+        version: '19.03.13'
     run_list:
       - recipe[docker_test::installation_package]
     excludes:
@@ -68,7 +68,7 @@ suites:
   - name: installation_tarball
     attributes:
       docker:
-        version: '19.03.8'
+        version: '19.03.13'
     run_list:
       - recipe[docker_test::installation_tarball]
 
@@ -82,7 +82,7 @@ suites:
       multiple_converge: 1
     attributes:
       docker:
-        version: '19.03.8'
+        version: '19.03.13'
     run_list:
       - recipe[docker_test::default]
       - recipe[docker_test::image]
@@ -99,7 +99,7 @@ suites:
       multiple_converge: 1
     attributes:
       docker:
-        version: '19.03.8'
+        version: '19.03.13'
     run_list:
       - recipe[docker_test::default]
       - recipe[docker_test::network]
@@ -113,7 +113,7 @@ suites:
       multiple_converge: 1
     attributes:
       docker:
-        version: '19.03.8'
+        version: '19.03.13'
     run_list:
       - recipe[docker_test::default]
       - recipe[docker_test::volume]
@@ -127,7 +127,7 @@ suites:
       multiple_converge: 1
     attributes:
       docker:
-        version: '19.03.8'
+        version: '19.03.13'
     run_list:
       - recipe[docker_test::default]
       - recipe[docker_test::registry]

diff --git a/spec/docker_test/installation_package_spec.rb b/spec/docker_test/installation_package_spec.rb
@@ -9,7 +9,7 @@
 
   context 'testing default action, default properties' do
     it 'installs docker' do
-      expect(chef_run).to create_docker_installation_package('default').with(version: '19.03.8')
+      expect(chef_run).to create_docker_installation_package('default').with(version: '19.03.13')
     end
   end
 

diff --git a/test/cookbooks/docker_test/recipes/installation_package.rb b/test/cookbooks/docker_test/recipes/installation_package.rb
@@ -1,4 +1,5 @@
 docker_installation_package 'default' do
-  version '19.03.8' unless platform_family?('fedora') # Fedora doesn't have this version
+  # Include epoch on RHEL to fix idempotency issues
+  version platform_family?('rhel', 'fedora') ? '3:19.03.13' : '19.03.13'
   action :create
 end