Merge pull request #28 from jessereynolds/apply_workflow_tests

remove puppet 6 from integration specs

Author: jessereynolds

spec/docker-compose.yml

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

spec/fixtures/inventory/docker.yaml

@@ -8,10 +8,10 @@ groups:
     config:
       ssh:
         port: 20022
-  - name: puppet_6_node
+  - name: puppet_7_node
     config:
       ssh:
-        port: 20024
+        port: 20025
   config:
     ssh:
       host: localhost

spec/integration/apply_spec.rb

@@ -218,9 +218,8 @@
           end
         end
 
-        # Run on puppet_6_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_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_7_node',
                 'path' => device_path
               }
             }
@@ -56,7 +56,7 @@
       end
     end
 
-    context "when running against puppet 6" do
+    context "when running against puppet 7" do
       it 'runs a plan that collects facts' do
         results = run_cli_json(%w[plan run device_test::facts -t device_targets], project: @project)
 
@@ -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_7_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_7_node',
                              "action" => "task",
                              "object" => "error::fail",
                              "status" => "failure",

spec/lib/bolt_spec/conn.rb

@@ -91,10 +91,6 @@ def docker_inventory(root: false)
               {
                 'name' => 'nix_agents',
                 'targets' => [
-                  {
-                    'name' => 'puppet_6_node',
-                    'config' => { 'ssh' => { 'port' => 20024 } }
-                  },
                   {
                     'name' => 'puppet_7_node',
                     'config' => { 'ssh' => { 'port' => 20025 } }