Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modulesync 7.0.0 and modernization #347

Merged
merged 18 commits into from
Sep 18, 2023
Merged

modulesync 7.0.0 and modernization #347

merged 18 commits into from
Sep 18, 2023

Conversation

jcpunk
Copy link
Contributor

@jcpunk jcpunk commented Aug 23, 2023

Pull Request (PR) description

Attempt at module sync to 7.0.0

This Pull Request (PR) fixes the following issues

@jcpunk jcpunk changed the title modulesync 6.0.0 modulesync 7.0.0 Aug 23, 2023
@jcpunk
Copy link
Contributor Author

jcpunk commented Aug 23, 2023

@trevor-vaughan any guesses what I need to do to make simp-beaker-helpers happy? The ruby here is far out of my depth...

@trevor-vaughan
Copy link
Collaborator

@jcpunk That's a underlying library dependency conflict unfortunately. Going to have to raise the upper bound in beaker-helpers itself and make sure it doesn't break anything.

@jcpunk
Copy link
Contributor Author

jcpunk commented Aug 24, 2023

I'm guessing simp/rubygem-simp-beaker-helpers#212 will fix me?

@silug
Copy link

silug commented Aug 24, 2023

I'm guessing simp/rubygem-simp-beaker-helpers#212 will fix me?

That's my hope. simp-beaker-helpers 1.32.0 should be available in a few minutes.

@jcpunk jcpunk force-pushed the modulesync branch 3 times, most recently from ac1871f to 5c85c23 Compare August 24, 2023 20:53
@jcpunk
Copy link
Contributor Author

jcpunk commented Aug 25, 2023

I think we're close, but I don't understand the remaining rspec errors....

@silug
Copy link

silug commented Aug 28, 2023

I think we're close, but I don't understand the remaining rspec errors....

You can fix the firewalld_version test with this:

diff --git a/spec/unit/facter/firewalld_version_spec.rb b/spec/unit/facter/firewalld_version_spec.rb
index bb943e1..4deea93 100644
--- a/spec/unit/facter/firewalld_version_spec.rb
+++ b/spec/unit/facter/firewalld_version_spec.rb
@@ -9,7 +9,7 @@ describe 'firewalld_version' do
     Process.stubs(:uid).returns(0)
     Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
     Facter::Util::Resolution.stubs(:which).with('firewall-offline-cmd').returns('/usr/bin/firewall-offline-cmd')
-    Facter::Core::Execution.stubs(:execute).with('/usr/bin/firewall-offline-cmd --version', on_fail: :failed).returns(firewalld_version)
+    Facter::Core::Execution.stubs(:execute).with('/usr/bin/firewall-offline-cmd --version', on_fail: :failed).returns(firewalld_version.dup)
   end
 
   let(:python_args) do

@jcpunk
Copy link
Contributor Author

jcpunk commented Aug 28, 2023

That seems to have gotten us further! Thanks!

Any idea why it isn't running the icmp-block bits in the test? I'd swear the test is configured to say it is not enabled and for puppet to enable it...

@silug
Copy link

silug commented Aug 28, 2023

That seems to have gotten us further! Thanks!

Any idea why it isn't running the icmp-block bits in the test? I'd swear the test is configured to say it is not enabled and for puppet to enable it...

I'm having no luck figuring that one out so far.

@jcpunk
Copy link
Contributor Author

jcpunk commented Aug 28, 2023

For the acceptance tests, I'm thinking it might make sense to switch to the default vox ones, but my attempt to do that was unsuccessful...

@jcpunk jcpunk changed the title modulesync 7.0.0 modulesync 7.0.0 and modernization Sep 5, 2023
@jcpunk jcpunk force-pushed the modulesync branch 3 times, most recently from 1c0d6db to c7817cb Compare September 5, 2023 20:44
@jcpunk
Copy link
Contributor Author

jcpunk commented Sep 5, 2023

I fought with this some more today, I feel like we're close but I'm very puzzled by the current errors...

@jcpunk jcpunk force-pushed the modulesync branch 5 times, most recently from 55273ec to 36e62ca Compare September 6, 2023 14:51
@jcpunk jcpunk force-pushed the modulesync branch 2 times, most recently from 349df40 to 298b733 Compare September 6, 2023 15:17
@jcpunk jcpunk merged commit fa1f9c0 into master Sep 18, 2023
16 of 18 checks passed
@jcpunk jcpunk deleted the modulesync branch September 18, 2023 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants