Skip to content

Commit

Permalink
Revert "Adopt to latest puppetlabs/apt changes"
Browse files Browse the repository at this point in the history 
This reverts commit 84850a5.
  • Loading branch information
@joshcooper
joshcooper committed Dec 6, 2024
1 parent 5c5bdc8 commit 9ae70cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions manifests/osfamily/debian.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@
# Pass in an empty content string since apt requires it even though we are removing it
apt::setting { 'list-puppet-enterprise-installer':
ensure => absent,
content => '',
}

apt::setting { 'conf-pe-repo':
ensure => absent,
priority => '90',
content => '',
}
} else {
$source = $puppet_agent::apt_source
Expand Down
4 changes: 3 additions & 1 deletion spec/classes/puppet_agent_osfamily_debian_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,16 @@
is_expected.to contain_apt__setting('conf-pe-repo')
.with({
'priority' => 90,
'content' => '',
'ensure' => 'absent',
})
}

it {

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Released / Puppet8 gem on Ruby 3.1 on macOS 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /Users/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node mac-1733526344702.local

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Released / Puppet8 gem on Ruby 3.1 on Linux 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /home/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node fv-az567-480.itjebmgn0j3uhacqyjknvwn20b.dx.internal.cloudapp.net

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Released / Puppet7 gem on Ruby 2.7 on macOS 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /Users/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node mac-1733526342085.local

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Released / Puppet7 gem on Ruby 2.7 on Linux 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /home/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node fv-az567-480.itjebmgn0j3uhacqyjknvwn20b.dx.internal.cloudapp.net

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Nightly / Puppet8 gem on Ruby 3.1 on Linux 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /home/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node fv-az733-396.nxm3qumc1lgurckcn0jkoxjypf.ex.internal.cloudapp.net

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Nightly / Puppet8 gem on Ruby 3.1 on macOS 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /Users/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node mac-1733526242587.local

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Nightly / Puppet7 gem on Ruby 2.7 on Linux 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /home/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node fv-az776-1.gib5dkvrjkgedmzi5ptrevqpbg.bx.internal.cloudapp.net

Check failure on line 66 in spec/classes/puppet_agent_osfamily_debian_spec.rb

View workflow job for this annotation

GitHub Actions / Nightly / Puppet7 gem on Ruby 2.7 on macOS 

puppet_agent when PE when managing PE debian apt repo is expected to contain Apt::Setting[list-puppet-enterprise-installer] with content  supplied string and ensure => "absent"

Failure/Error:
  is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
    .with({
            'content' => '',
            'ensure'  => 'absent',
          })

Puppet::PreformattedError:
  Evaluation Error: Error while evaluating a Resource Statement, Apt::Setting[list-puppet-enterprise-installer]: parameter 'content' expects a value of type Undef or String[1], got String (file: /Users/runner/work/puppetlabs-puppet_agent/puppetlabs-puppet_agent/spec/fixtures/modules/puppet_agent/manifests/osfamily/debian.pp, line: 61) on node mac-1733526164062.local
is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
.with({
'ensure' => 'absent',
'content' => '',
'ensure' => 'absent',
})
}
end
Expand Down

0 comments on commit 9ae70cf

Please sign in to comment.