Merge pull request #783 from puppetlabs/task_spec_puppet7_puppet8

(PA-7433) Update task_spec to upgrade from puppet7 to latest puppet8 dev build

Author: joshcooper

.github/workflows/task_acceptance_tests.yaml

@@ -22,6 +22,12 @@ jobs:
 
     runs-on: 'ubuntu-latest'
     steps:
+
+      - name: Connect to Twingate
+        uses: twingate/github-action@v1
+        with:
+          service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+
       - name: Checkout current PR code
         uses: actions/checkout@v4
 

task_spec/spec/acceptance/init_spec.rb

@@ -123,7 +123,6 @@ def latest_sources
                          end
 
       puppet_7_collection = 'puppet7'
-      puppet_8_collection = 'puppet8'
 
       # We can only test puppet 7 -> 7 upgrades if multiple Puppet releases
       # have supported a given platform.
@@ -162,6 +161,7 @@ def latest_sources
           expect(res['value']['version']).to eq(puppet_7_version)
         end
         expect(res['value']['source']).to be
+        logger.info("Successfully installed puppet-agent version: #{res['value']['version']}")
       end
 
       # Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
@@ -175,7 +175,7 @@ def latest_sources
 
       # Try to upgrade with no specific version given in parameter
       # Expect nothing to happen and receive a message regarding this
-      results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection })
+      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly' }.merge(latest_sources))
 
       results.each do |result|
         logger.info("Ensuring installed puppet-agent on #{result['target']}: #{result['status']}")
@@ -220,6 +220,7 @@ def latest_sources
           expect(res['value']['version']).not_to eq(puppet_7_version)
           expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
           expect(res['value']['source']).to be
+          logger.info("Successfully upgraded to puppet7 latest version: #{res['value']['version']}")
         end
       end
 
@@ -239,8 +240,8 @@ def latest_sources
       end
 
       # Succesfully upgrade from puppet7 to puppet8
-      results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => 'latest' })
-
+      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
+                                                              'version' => 'latest' }.merge(latest_sources))
       results.each do |result|
         logger.info("Upgraded puppet-agent to puppet8 on #{result['target']}: #{result['status']}")
         log_output_errors(result)
@@ -257,12 +258,13 @@ def latest_sources
         expect(installed_version).not_to match(%r{^7\.\d+\.\d+})
         expect(installed_version).to match(%r{^8\.\d+\.\d+})
         expect(res['value']['source']).to be
+        logger.info("Successfully upgraded to puppet8 latest version: #{res['value']['version']}")
       end
 
       # Try installing the same version again
       # Expect nothing to happen and receive a message regarding this
-      results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => installed_version })
-
+      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
+                                                              'version' => installed_version }.merge(latest_sources))
       results.each do |res|
         expect(res).to include('status' => 'success')
         expect(res['value']['_output']).to match(%r{Puppet Agent #{installed_version} detected. Nothing to do.})