(PA-6760) Update task_acceptance tests for MacOS15 ARM

(PA-6760) Updated tests

(PA-6760) Fix rubocop

Author: skyamgarp

task_spec/spec/acceptance/init_spec.rb

@@ -116,132 +116,157 @@ def latest_platform_list
       expect(res['value']['version']).to eq(nil)
     end
 
-    # Try to install an older puppet7 version
-    results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_7_collection,
-                                                            'version' => puppet_7_version,
-                                                            'stop_service' => true })
-
-    results.each do |result|
-      logger.info("Installed puppet-agent on #{result['target']}: #{result['status']}")
-      log_output_errors(result)
-    end
+    if target_platform == 'osx-15-arm64'
+      # Install an puppet8 nightly version
+      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
+                                                              'version' => 'latest',
+                                                              'stop_service' => true })
 
-    expect(results).to all(include('status' => 'success'))
+      results.each do |result|
+        logger.info("Installed puppet-agent on #{result['target']}: #{result['status']}")
+        log_output_errors(result)
+      end
 
-    # It installed a version older than latest puppet7
-    results = run_task('puppet_agent::version', 'target', {})
-    results.each do |res|
-      expect(res).to include('status' => 'success')
-      if puppet_7_version == 'latest'
-        expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
-      else
-        expect(res['value']['version']).to eq(puppet_7_version)
+      expect(results).to all(include('status' => 'success'))
+
+      # Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
+      service = run_command('/opt/puppetlabs/bin/puppet resource service puppet', 'target')
+      output = service[0]['value']['stdout']
+      expect(output).to match(%r{ensure\s+=> 'stopped'})
+
+      results = run_task('puppet_agent::version', 'target', {})
+      results.each do |res|
+        expect(res).to include('status' => 'success')
+        expect(res['value']['version']).to match(%r{^8\.\d+\.\d+})
       end
-      expect(res['value']['source']).to be
-    end
+    else
+      # Try to install an older puppet7 version
+      results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_7_collection,
+                                                              'version' => puppet_7_version,
+                                                              'stop_service' => true })
 
-    # Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
-    service = if target_platform.include?('win')
-                run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet', 'target')
-              else
-                run_command('/opt/puppetlabs/bin/puppet resource service puppet', 'target')
-              end
-    output = service[0]['value']['stdout']
-    expect(output).to match(%r{ensure\s+=> 'stopped'})
-
-    # 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_7_collection })
-
-    results.each do |result|
-      logger.info("Ensuring installed puppet-agent on #{result['target']}: #{result['status']}")
-      log_output_errors(result)
-    end
+      results.each do |result|
+        logger.info("Installed puppet-agent on #{result['target']}: #{result['status']}")
+        log_output_errors(result)
+      end
 
-    results.each do |res|
-      expect(res).to include('status' => 'success')
-      expect(res['value']['_output']).to match(%r{Version parameter not defined and agent detected. Nothing to do.})
-    end
+      expect(results).to all(include('status' => 'success'))
 
-    # Verify that the version didn't change
-    results = run_task('puppet_agent::version', 'target', {})
-    results.each do |res|
-      expect(res).to include('status' => 'success')
-      if puppet_7_version == 'latest'
-        expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
-      else
-        expect(res['value']['version']).to eq(puppet_7_version)
+      # It installed a version older than latest puppet7
+      results = run_task('puppet_agent::version', 'target', {})
+      results.each do |res|
+        expect(res).to include('status' => 'success')
+        if puppet_7_version == 'latest'
+          expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
+        else
+          expect(res['value']['version']).to eq(puppet_7_version)
+        end
+        expect(res['value']['source']).to be
       end
-      expect(res['value']['source']).to be
-    end
 
-    # An OS needs to be supported for more than one 7.x release to test the
-    # upgrade from puppet_7_version to latest
-    if multiple_puppet7_versions
+      # Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
+      service = if target_platform.include?('win')
+                  run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet', 'target')
+                else
+                  run_command('/opt/puppetlabs/bin/puppet resource service puppet', 'target')
+                end
+      output = service[0]['value']['stdout']
+      expect(output).to match(%r{ensure\s+=> 'stopped'})
 
-      # Upgrade to latest puppet7 version
-      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
+      # 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.each do |result|
-        logger.info("Upgraded puppet-agent to latest puppet7 on #{result['target']}: #{result['status']}")
+        logger.info("Ensuring installed puppet-agent on #{result['target']}: #{result['status']}")
         log_output_errors(result)
       end
 
-      expect(results).to all(include('status' => 'success'))
+      results.each do |res|
+        expect(res).to include('status' => 'success')
+        expect(res['value']['_output']).to match(%r{Version parameter not defined and agent detected. Nothing to do.})
+      end
 
-      # Verify that it upgraded
+      # Verify that the version didn't change
       results = run_task('puppet_agent::version', 'target', {})
       results.each do |res|
         expect(res).to include('status' => 'success')
-        expect(res['value']['version']).not_to eq(puppet_7_version)
-        expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
+        if puppet_7_version == 'latest'
+          expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
+        else
+          expect(res['value']['version']).to eq(puppet_7_version)
+        end
         expect(res['value']['source']).to be
       end
-    end
 
-    # Puppet Agent can't be upgraded on Windows nodes while 'puppet agent' service or 'pxp-agent' service are running
-    if target_platform.include?('win')
-      # Try to upgrade from puppet6 to puppet7 but fail due to puppet agent service already running
-      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
-      results.each do |res|
-        expect(res).to include('status' => 'failure')
-        expect(res['value']['_error']['msg']).to match(%r{Puppet Agent upgrade cannot be done while Puppet services are still running.})
+      # An OS needs to be supported for more than one 7.x release to test the
+      # upgrade from puppet_7_version to latest
+      if multiple_puppet7_versions
+
+        # Upgrade to latest puppet7 version
+        results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
+
+        results.each do |result|
+          logger.info("Upgraded puppet-agent to latest puppet7 on #{result['target']}: #{result['status']}")
+          log_output_errors(result)
+        end
+
+        expect(results).to all(include('status' => 'success'))
+
+        # Verify that it upgraded
+        results = run_task('puppet_agent::version', 'target', {})
+        results.each do |res|
+          expect(res).to include('status' => 'success')
+          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
+        end
       end
 
-      # Manually stop the puppet agent service
-      service = run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet ensure=stopped', 'target')
-      output = service[0]['value']['stdout']
-      expect(output).to match(%r{ensure\s+=> 'stopped'})
-    end
+      # Puppet Agent can't be upgraded on Windows nodes while 'puppet agent' service or 'pxp-agent' service are running
+      if target_platform.include?('win')
+        # Try to upgrade from puppet6 to puppet7 but fail due to puppet agent service already running
+        results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
+        results.each do |res|
+          expect(res).to include('status' => 'failure')
+          expect(res['value']['_error']['msg']).to match(%r{Puppet Agent upgrade cannot be done while Puppet services are still running.})
+        end
+
+        # Manually stop the puppet agent service
+        service = run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet ensure=stopped', 'target')
+        output = service[0]['value']['stdout']
+        expect(output).to match(%r{ensure\s+=> 'stopped'})
+      end
 
-    # Succesfully upgrade from puppet7 to puppet8
-    results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => 'latest' })
+      # Succesfully upgrade from puppet7 to puppet8
+      results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => 'latest' })
 
-    results.each do |result|
-      logger.info("Upgraded puppet-agent to puppet8 on #{result['target']}: #{result['status']}")
-      log_output_errors(result)
-    end
+      results.each do |result|
+        logger.info("Upgraded puppet-agent to puppet8 on #{result['target']}: #{result['status']}")
+        log_output_errors(result)
+      end
 
-    expect(results).to all(include('status' => 'success'))
+      expect(results).to all(include('status' => 'success'))
 
-    # Verify that it upgraded
-    installed_version = nil
-    results = run_task('puppet_agent::version', 'target', {})
-    results.each do |res|
-      expect(res).to include('status' => 'success')
-      installed_version = res['value']['version']
-      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
-    end
+      # Verify that it upgraded
+      installed_version = nil
+      results = run_task('puppet_agent::version', 'target', {})
+      results.each do |res|
+        expect(res).to include('status' => 'success')
+        installed_version = res['value']['version']
+        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
+      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 })
+      # 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.each do |res|
-      expect(res).to include('status' => 'success')
-      expect(res['value']['_output']).to match(%r{Puppet Agent #{installed_version} detected. Nothing to do.})
+      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.})
+      end
     end
   end
 end

tasks/install_shell.sh

@@ -137,7 +137,7 @@ if [ -n "$PT_mac_source" ]; then
   mac_source=$PT_mac_source
 else
   if [ "$nightly" = true ]; then
-    mac_source='http://nightlies.puppet.com/downloads'
+    mac_source='https://artifactory.delivery.puppetlabs.net/artifactory/internal_nightly/downloads'
   else
     mac_source='http://downloads.puppet.com'
   fi
@@ -254,6 +254,7 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
       "12")    platform_version="12";;
       "13")    platform_version="13";;
       "14")    platform_version="14";;
+      "15")    platform_version="15";;
       *) echo "No builds for platform: $major_version"
          exit 1
          ;;