Docker tests: Replace puppet 6 with puppet 8 container

Author: bastelfreak

documentation/experimental_features.md

@@ -224,13 +224,13 @@ specify the option on the command line as `--stream`. Bolt streams results back
 they are received, with the target's safe name (the URI without the password included) and the
 stream (either 'out' or 'err') appended to the message, like so:
 ```
-Started on docker://puppet_6_node...
+Started on docker://puppet_8_node...
 Started on docker://puppet_7_node...
 [docker://puppet_7_node] out: Hello!
-[docker://puppet_6_node] out: Hello!
+[docker://puppet_8_node] out: Hello!
 Finished on docker://puppet_7_node:
   Hello!
-Finished on docker://puppet_6_node:
+Finished on docker://puppet_8_node:
   Hello!
 ```
 

spec/docker-compose.yml

@@ -6,12 +6,12 @@ services:
     ports:
       - "20022:22"
 
-  puppet_6_node:
+  puppet_8_node:
     build:
       context: .
       args:
-        PUPPET_COLLECTION: puppet6
-    container_name: puppet_6_node
+        PUPPET_COLLECTION: puppet8
+    container_name: puppet_8_node
     ports:
       - "20024:22"
 

spec/fixtures/inventory/docker.yaml

@@ -8,7 +8,7 @@ groups:
     config:
       ssh:
         port: 20022
-  - name: puppet_6_node
+  - name: puppet_8_node
     config:
       ssh:
         port: 20024

spec/integration/apply_spec.rb

@@ -214,13 +214,13 @@
           results.each do |result|
             expect(result['status']).to eq('success')
             report = result['value']['report']
-            expect(report['resource_statuses']).to include(/Notify\[Hello puppet_[5-7]_node\]/)
+            expect(report['resource_statuses']).to include(/Notify\[Hello puppet_[7-8]_node\]/)
           end
         end
 
-        # Run on puppet_6_node and puppet_7_node only, as deferred requires >= 6.
+        # Run on puppet_8_node and puppet_7_node only, as deferred requires >= 6.
         it 'applies the deferred type' do
-          result = run_cli_json(%w[plan run basic::defer -t puppet_6_node,puppet_7_node], project: project)
+          result = run_cli_json(%w[plan run basic::defer -t puppet_8_node,puppet_7_node], project: project)
           expect(result).not_to include('kind')
           expect(result[0]['status']).to eq('success')
           resources = result[0]['value']['report']['resource_statuses']

spec/integration/device_spec.rb

@@ -28,7 +28,7 @@
               'transport' => 'remote',
               'remote' => {
                 'remote-transport' => 'fake',
-                'run-on' => 'puppet_6_node',
+                'run-on' => 'puppet_8_node',
                 'path' => device_path
               }
             }
@@ -77,7 +77,7 @@
         expect(results).not_to include('kind')
         expect(results.dig(0, 'value', 'report', 'resource_statuses')).to include('Fake_device[key1]')
 
-        content = run_cli_json(['command', 'run', "cat '#{device_path}'", '-t', 'puppet_6_node'], project: @project)
+        content = run_cli_json(['command', 'run', "cat '#{device_path}'", '-t', 'puppet_8_node'], project: @project)
 
         expect(content.dig('items', 0, 'value', 'stdout')).to eq({ key1: 'val1' }.to_json)
 

spec/integration/parallel_spec.rb

@@ -246,7 +246,7 @@
                           { "action" => "run_task",
                             "object" => "error::fail",
                             "result_set" =>
-                          [{ "target" => 'puppet_6_node',
+                          [{ "target" => 'puppet_8_node',
                              "action" => "task",
                              "object" => "error::fail",
                              "status" => "failure",

spec/lib/bolt_spec/conn.rb

@@ -92,7 +92,7 @@ def docker_inventory(root: false)
                 'name' => 'nix_agents',
                 'targets' => [
                   {
-                    'name' => 'puppet_6_node',
+                    'name' => 'puppet_8_node',
                     'config' => { 'ssh' => { 'port' => 20024 } }
                   },
                   {