-
Notifications
You must be signed in to change notification settings - Fork 59
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
feat(freebsd): add FreeBSD support (recover abandoned PR #32) #54
feat(freebsd): add FreeBSD support (recover abandoned PR #32) #54
Conversation
6fa6354
to
f17158a
Compare
Updated the PR to use the new pre-salted Vagrant boxes as introduced here: |
adb640a
to
7b349da
Compare
7b349da
to
4091eb3
Compare
Service wasn't starting without this being resolved.
* Semi-automated using myii/ssf-formula#305
4091eb3
to
208e31b
Compare
@dafyddj Finalised this PR; would you mind reviewing again and merging if all OK? |
@dafyddj So we're getting a failure here: -----> Verifying <install-binary-freebsd-130-master-py3>...
Loaded install_binary
[...] WARN: Cannot find a UUID for your node.
Profile: vault formula (install_binary)
Version: (not specified)
Target: ssh://vagrant@127.0.0.1:2222
Target ID:
File /usr/local/bin/vault
✔ is expected to be a file
✔ is expected to be executable
Command: `/usr/local/bin/vault -version`
✔ exit_status is expected to eq 0
✔ stderr is expected to be empty
✔ stdout is expected to match /^Vault v1.1.0 \('36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd'\)/
Service vault
× is expected not to be installed
expected Service vault not to be installed
✔ is expected not to be enabled
✔ is expected not to be running
File /etc/vault/conf.d/config.json
✔ is expected not to be a file Looks like we've got a regression, introduced by this commit in InSpec:
When I run it through |
Adding these lines back in gets it working: def info(service_name)
cmd = inspec.command("#{service_ctl} -e")
return nil if cmd.exit_status != 0
# search for the service
srv = %r{^.*/(#{service_name}$)}.match(cmd.stdout)
return nil if srv.nil? || srv[0].nil?
So our FreeBSD failures are a false-positive; this PR can still be merged, @dafyddj. |
Approved. Thanks both for the work on this. We should report that |
🎉 This PR is included in version 1.3.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Already added the fix to our fork on InSpec: Which is working out fine: Reported the issue and sent through a PR: |
PR progress checklist (to be filled in by reviewers)
What type of PR is this?
Primary type
[build]
Changes related to the build system[chore]
Changes to the build process or auxiliary tools and libraries such as documentation generation[ci]
Changes to the continuous integration configuration[feat]
A new feature[fix]
A bug fix[perf]
A code change that improves performance[refactor]
A code change that neither fixes a bug nor adds a feature[revert]
A change used to revert a previous commit[style]
Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)Secondary type
[docs]
Documentation changes[test]
Adding missing or correcting existing testsDoes this PR introduce a
BREAKING CHANGE
?No.
Related issues and/or pull requests
Describe the changes you're proposing
Build upon the work done in #32, adding FreeBSD (Vagrant) testing in GitHub Actions.
Pillar / config required to test the proposed changes
Debug log showing how the proposed changes work
Documentation checklist
README
(e.g.Available states
).pillar.example
.Testing checklist
state_top
).Additional context