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

ec2: shellcheck fixes #340489

Merged
merged 1 commit into from
Oct 7, 2024
Merged

ec2: shellcheck fixes #340489

merged 1 commit into from
Oct 7, 2024

Conversation

r-vdp
Copy link
Contributor

@r-vdp r-vdp commented Sep 8, 2024

Description of changes

Fix errors when enabling shellcheck on systemd service scripts (see #311394)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 8, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Sep 8, 2024
@pbsds
Copy link
Member

pbsds commented Sep 12, 2024

@ofborg test ec2-nixops

@pbsds
Copy link
Member

pbsds commented Sep 13, 2024

ec2-nixops has failed twice on ofborg, but succeeds for me locally. Any ideas?

https://logs.ofborg.org/?key=nixos/nixpkgs.340489&attempt_id=708d5437-709b-43b5-9e41-f3c56c38bceb

@ofborg test ec2-nixops

@r-vdp
Copy link
Contributor Author

r-vdp commented Sep 13, 2024

I will try to take a look later today, I think it also worked for me locally when I made this commit (several months ago, things might have changed on master in the meantime).

I used to have some machines on AWS, which is why I ran into this in the first place, but I have since moved to another platform.

@Mic92
Copy link
Member

Mic92 commented Sep 28, 2024

ec2-nixops has failed twice on ofborg, but succeeds for me locally. Any ideas?

https://logs.ofborg.org/?key=nixos/nixpkgs.340489&attempt_id=708d5437-709b-43b5-9e41-f3c56c38bceb

@ofborg test ec2-nixops

I believe this plugin was also recently removed: #343727

@Mic92
Copy link
Member

Mic92 commented Sep 28, 2024

Ok. no. this was just the aws plugin.

@pbsds
Copy link
Member

pbsds commented Sep 29, 2024

@ofborg test ec2-nixops

@r-vdp
Copy link
Contributor Author

r-vdp commented Oct 4, 2024

This test also fails on master for me when building it locally, I couldn't get it to work.

Copy link
Member

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

able to reproduce the issue.

I checked with the shellcheck rationale, diff LGTM!

@pbsds pbsds merged commit cd9a004 into NixOS:master Oct 7, 2024
29 checks passed
@r-vdp r-vdp deleted the ec2-shellcheck-fixes branch October 7, 2024 13:40
@arianvp
Copy link
Member

arianvp commented Oct 14, 2024

Urgh this actually broke SSH access for our AWS images. I wish I was tagged for review on this. I would've tested it. I am marked as maintainer for amazon-image but apparently not for ec2-data. I'll make a PR to make sure I get tagged

@arianvp
Copy link
Member

arianvp commented Oct 14, 2024

I will try to allocate some time to write / fix a NixOS test that would've made this a channel blocker

@pbsds
Copy link
Member

pbsds commented Oct 14, 2024

Thank you for following this up. Consider adding yourself to CODEOWNERS as well to ensure the ping, since nixos PRs commonly don't ping meta.maintainers due to a lack of tooling. It should be a nicer experience and possible for anyone as of #347610, and be more encouraged.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/63

@arianvp
Copy link
Member

arianvp commented Dec 10, 2024

I'm trying to retro why this ever made it past a channel bump and I don't understand why. ec2-nixops (Which is just a badly named test as it doesn't do anything NixOps specific ; it just tests SSH access) is a channel-blocking test and it failed on this PR so I expect it also failed on Hydra. That the test was failing was remarked by multiple people in review and then this was merged anyway. This is not the part I'm interested in though. The part I'm interested in is why our automation didn't catch the issue after merge?

When it got merged I would expect the test to have failed on Hydra and block the channel. Why did this not happen?

@arianvp
Copy link
Member

arianvp commented Dec 10, 2024

Ah because it's not in the tested job. I will make a PR to add it. I can also rename the test to be more descriptive

@arianvp arianvp mentioned this pull request Dec 16, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants