Merge pull request #822 from puppetlabs/puppetcore9-nightly

(PA-8250) Allow installation of puppetcore9-nightly packages

Author: mhashizume

.sync.yml

@@ -43,6 +43,14 @@ Gemfile:
     ":system_tests":
       - gem: voxpupuli-acceptance
         version: '~> 3'
+      - gem: puppet_litmus
+        version:
+          - '~> 1.0'
+          - '!= 1.6.1'
+        condition: 'ENV["PUPPET_FORGE_TOKEN"].to_s.empty?'
+        platforms:
+          - ruby
+          - x64_mingw
 
 .github/workflows/release.yml:
   unmanaged: false

Gemfile

@@ -75,11 +75,11 @@ group :development, :release_prep do
   gem "puppet-blacksmith", '~> 7.0',      require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '~> 2.0',      require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
-  gem "puppet_litmus", '~> 1.0',      require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
-  gem "CFPropertyList", '< 3.0.7',    require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "serverspec", '~> 2.41',        require: false
-  gem "voxpupuli-acceptance", '~> 3', require: false
+  gem "puppet_litmus", '~> 2.0',             require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gem "puppet_litmus", '~> 1.0',             require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gem "CFPropertyList", '< 3.0.7',           require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "serverspec", '~> 2.41',               require: false
+  gem "voxpupuli-acceptance", '~> 3',        require: false
 end
 
 gems = {}

docker/bin/helpers/run-install.sh

@@ -18,6 +18,9 @@ if [[ -z "$to_collection" ]]; then
         8)
             to_collection=puppetcore8
             ;;
+        9)
+            to_collection=puppetcore9
+            ;;
         *)
             echo "$0: Invalid version supplied" 1>&2
             exit 1

metadata.json

@@ -82,7 +82,7 @@
       "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
-  "pdk-version": "3.5.1",
+  "pdk-version": "3.6.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates#3.5.1",
   "template-ref": "tags/3.5.1-0-g9d5b193"
 }

spec/spec_helper.rb

@@ -11,7 +11,11 @@
 
 include RspecPuppetFacts
 
-default_facts = {}
+default_facts = {
+  puppetversion: Puppet.version,
+  facterversion: Facter.version,
+  aio_agent_version: Puppet.version,
+}
 
 default_fact_files = [
   File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
@@ -22,15 +26,16 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
+    require 'deep_merge'
+    default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
   rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end
 
-# check if default_module_facts is defined and merge them if the case
-if @default_module_facts.is_a?(Hash)
-  default_facts.merge!(@default_module_facts)
+# read default_facts and merge them over what is provided by facterdb
+default_facts.each do |fact, value|
+  add_custom_fact fact, value, merge_facts: true
 end
 
 RSpec.configure do |c|

task_spec/spec/acceptance/init_spec.rb

@@ -38,22 +38,6 @@ def log_output_errors(result)
     puts logger.info(out)
   end
 
-  # This method contains a list of platforms that are only available in nightly builds of puppet-agent. Once a regular
-  # release of puppet-agent includes support for these platforms, they can be removed from this method and added to
-  # the logic that determines the puppet_7_version variable below.
-  def latest_platform_list
-    %r{
-      fedora-41|
-      osx-15-arm64|
-      osx-15-x86_64|
-      amazonfips-2023|
-      el-10|
-      debian-13-aarch64|
-      debian-13-amd64|
-      osx-26
-    }x
-  end
-
   # This method lists sources to be used when installing packages that haven't been released yet (see above).
   def latest_sources
     {
@@ -64,189 +48,73 @@ def latest_sources
     }
   end
 
-  it 'works with version and install tasks' do
-    case target_platform
-    when latest_platform_list
-      # Here we only install puppet-agent 8.x from nightlies as we don't support 7.x
-      # We have to consider tests to upgrade puppet 8.x to latest nightlies in future
-
-      # Install an puppet8 nightly version
-      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
-                                                              'version' => 'latest',
-                                                              'stop_service' => true }.merge(latest_sources))
+  it 'installs puppetcore8-nightly' do
+    results = run_task('puppet_agent::install', 'target',
+      {
+        'collection' => 'puppetcore8-nightly',
+        'version' => 'latest',
+        'stop_service' => true
+      }.merge(latest_sources))
+
+    results.each do |result|
+      logger.info("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
+    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'})
+
+    # Check for idempotency
+    installed_versions = {}
+    results = run_task('puppet_agent::version', 'target', {})
+    results.each do |res|
+      expect(res).to include('status' => 'success')
+      installed_version = res['value']['version']
+      installed_versions[target_platform] = installed_version
+      expect(installed_version).to match(%r{^8\.\d+\.\d+})
+    end
 
-      expect(results).to all(include('status' => 'success'))
+    results = run_task('puppet_agent::install', 'target',
+      {
+        'collection' => 'puppetcore8-nightly',
+        'version'    => installed_versions[target_platform]
+      }.merge(latest_sources))
 
-      # 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.each do |res|
+      expect(res).to include('status' => 'success')
+      expect(res['value']['_output']).to match(%r{Puppet Agent #{installed_versions[target_platform]} detected. Nothing to do.})
+    end
+  end
 
-      # Check for puppet-agent version installed
-      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
+  # We don't have puppet9 builds for these
+  SKIP_PLATFORMS = Regexp.new(<<~END, Regexp::EXTENDED)
+    ^amazon-2-|
+    ^debian-10-|
+    ^el-7-|
+    ^fedora-36-|
+    ^fedora-40-|
+    ^redhatfips-7-|
+    ^sles-11-|
+    ^solaris-10-|
+    ^ubuntu-18.04-|
+    ^ubuntu-20.04-
+  END
+
+  it 'upgrades to puppetcore9-nightly' do
+    if target_platform.match?(SKIP_PLATFORMS)
+      logger.info("Platform #{target_platform} isn't supported in puppetcore9, skipping")
     else
-      # Specify the first released version for each target platform. When adding a new
-      # OS, you'll typically want to specify 'latest' to install from nightlies, since
-      # official packages won't be released until later. During the N+1 release, you'll
-      # want to change `target_platform` to be the first version (N) that added the OS.
-      puppet_7_version = case target_platform
-                         when %r{debian-11-amd64}
-                           '7.9.0'
-                         when %r{el-9-x86_64}
-                           '7.14.0'
-                         when %r{fedora-36}
-                           '7.19.0'
-                         when %r{osx-11}
-                           '7.7.0'
-                         when %r{osx-12}, %r{ubuntu-22.04-amd64}
-                           '7.18.0'
-                         when %r{osx-13}
-                           '7.26.0'
-                         when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}
-                           '7.27.0'
-                         when %r{amazon-2023}, %r{osx-14}, %r{debian-11-aarch64}
-                           '7.28.0'
-                         when %r{debian-12}
-                           '7.29.0'
-                         when %r{el-9-ppc64le}, %r{amazon-2}, %r{fedora-40}
-                           '7.31.0'
-                         when %r{ubuntu-24.04}
-                           '7.32.1'
-                         else
-                           '7.18.0'
-                         end
-
-      puppet_7_collection = 'puppet7'
-
-      # We can only test puppet 7 -> 7 upgrades if multiple Puppet releases
-      # have supported a given platform.
-      multiple_puppet7_versions = true
-
-      # extra request is needed on windows hosts
-      # this will fail with "execution expired"
-      run_task('puppet_agent::version', 'target', {}) if target_platform.include?('win')
-
-      # Test the agent isn't already installed and that the version task works
-      results = run_task('puppet_agent::version', 'target', {})
-      results.each do |res|
-        expect(res).to include('status' => 'success')
-        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
-
-      expect(results).to all(include('status' => 'success'))
-
-      # 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
-        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
-      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' => 'puppet8-nightly' }.merge(latest_sources))
-
+      results = run_task('puppet_agent::install', 'target',
+        {
+          'collection' => 'puppetcore9-nightly',
+          'version'    => 'latest',
+        }.merge(latest_sources))
       results.each do |result|
-        logger.info("Ensuring 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
-
-      # 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)
-        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
-
-        # 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
-          logger.info("Successfully upgraded to puppet7 latest version: #{res['value']['version']}")
-        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.})
-        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' => 'puppet8-nightly',
-                                                              'version' => 'latest' }.merge(latest_sources))
-      results.each do |result|
-        logger.info("Upgraded puppet-agent to puppet8 on #{result['target']}: #{result['status']}")
+        logger.info("Upgraded puppet-agent to puppet9 on #{result['target']}: #{result['status']}")
         log_output_errors(result)
       end
 
@@ -258,19 +126,9 @@ def latest_sources
       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(installed_version).to match(%r{^(9\.\d+\.\d+|8\.99\.\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' => '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.})
+        logger.info("Successfully upgraded to puppet9 latest version: #{res['value']['version']}")
       end
     end
   end

task_spec/spec/acceptance/nodesets/docker/debian-13.yml

@@ -0,0 +1,13 @@
+HOSTS:
+  debian-13-x64:
+    roles:
+      - target
+    platform: debian-13-amd64
+    hypervisor: docker
+    image: debian:13
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
+CONFIG:
+  trace_limit: 200