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

Set systemd as default for Raspbian 12 #9170

Closed
wants to merge 1 commit into from

Conversation

jaevans
Copy link
Contributor

@jaevans jaevans commented Nov 22, 2023

Fix for #9169. Needed for Raspberry Pis running bookworm.

https://perforce.atlassian.net/browse/PUP-11949

@jaevans jaevans requested a review from a team as a code owner November 22, 2023 23:12
@joshcooper
Copy link
Contributor

Thanks @jaevans! Could you rebase your PR on main and retarget your PR? We've changed how backports are handled since you originally filed this bug.

@puppetlabs-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@jaevans jaevans force-pushed the systemd-for-raspbian-7.x branch from 74a2eb5 to a911d1c Compare March 13, 2024 16:25
@jaevans jaevans requested review from a team as code owners March 13, 2024 16:25
@jaevans
Copy link
Contributor Author

jaevans commented Mar 14, 2024

I rebased on main, that brought in a bunch of 8.x stuff, was that the correct thing to do? What else needs to be done for this PR?

@joshcooper
Copy link
Contributor

joshcooper commented Apr 10, 2024

Hi @jaevans could you do the following:

git checkout main
git pull
git checkout systemd-for-raspbian-7.x
git reset --hard upstream/main
git cherry-pick a911d1cd2eaf129a738cc6466eea5defa6968aa4
git push --force <remote> HEAD

Then change the base branch for this PR to main. Once the changes are merged to main, we will handle backporting to 7.x provided it is low-risk and doesn't break existing provider suitability checks.

@jaevans jaevans force-pushed the systemd-for-raspbian-7.x branch from a911d1c to 2dc127f Compare April 12, 2024 20:26
@jaevans jaevans changed the base branch from 7.x to main April 12, 2024 20:34
@joshcooper
Copy link
Contributor

Hi @jaevans it seems your pull request contains a merge commit d4c9652. We prefer that PRs don't contain merge commits, otherwise, it complicates the git history. Could you execute the following:

git checkout systemd-for-raspbian-7.x
git fetch upstream
git reset --hard upstream/main
git cherry-pick 2dc127f
git push -f origin HEAD

The above commands assume upstream is the puppetlabs remote and origin is your fork. You can see which is which by executing git remote -v

@joshcooper joshcooper added the bug Something isn't working label Apr 23, 2024
@jaevans jaevans force-pushed the systemd-for-raspbian-7.x branch from d4c9652 to 3ce4097 Compare May 25, 2024 00:52
@jaevans
Copy link
Contributor Author

jaevans commented May 25, 2024

Sorry for the delay, should be fixed now.

@Rocco83
Copy link

Rocco83 commented Jul 25, 2024

What are the blockers for this PR?
Seems to me that the failing tests are not related to this one.

it "should be the default provider on raspbian12" do
allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
allow(Facter).to receive(:value).with(:operatingsystem).and_return(:raspbian)
allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("12")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puppet 8 (main) uses structured facts so these stubs need to be updated. Something like:

-    allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
-    allow(Facter).to receive(:value).with(:operatingsystem).and_return(:raspbian)
-    allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("12")
+    allow(Facter).to receive(:value).with(:os.family).and_return(:debian)
+    allow(Facter).to receive(:value).with(:os.name).and_return(:raspbian)
+    allow(Facter).to receive(:value).with(:os.release.major).and_return("12")

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jaevans will you take care or have you given up (for whatever reason)?

@joshcooper
Copy link
Contributor

I've created a new PR in #9477 and updated the specs to stub facter correctly. You'll remain the original author for the commit. Thanks for your contribution!

@joshcooper joshcooper closed this Sep 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong service provider selected for Raspberry Pi OS (raspbian) 12 bookworm
5 participants