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.

Sign up for GitHub

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

Jump to bottom

etcd 3.5: Install shellcheck if not exists. #18229

Merged
merged 1 commit into from
Jun 28, 2024
Merged

etcd 3.5: Install shellcheck if not exists. #18229

merged 1 commit into from
Jun 28, 2024
+24 −2

Conversation

thedtripp
Copy link
Contributor

@thedtripp thedtripp commented Jun 25, 2024 •
edited
Loading

Backporting shellcheck installation method to 3.5 as described here: #18216 (review)

Related issue: #17472

@k8s-ci-robot
Copy link

Hi @thedtripp. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@thedtripp thedtripp mentioned this pull request Jun 25, 2024
Open
@thedtripp
Copy link
Contributor Author

Currently, this is failing the arm64 / test (linux-test-smoke). Looks like the shellcheck binary is not arm compatible. I will try adding some conditional logic to install the arm version where appropriate.

image

@thedtripp thedtripp marked this pull request as draft June 25, 2024 02:13
@thedtripp thedtripp force-pushed the feature/installShellcheckBackport3.5 branch from 182286b to 55afcff Compare June 26, 2024 05:27
@thedtripp thedtripp marked this pull request as ready for review June 26, 2024 05:35
@jmhbnz
Copy link
Member

jmhbnz commented Jun 26, 2024

/ok-to-test

@ivanvc
Copy link
Member

ivanvc commented Jun 27, 2024

Hi @thedtripp, thanks for working on this. Can you reference commit 4f23883 and pull request #14872 in your commit message? So it's easier to identify what's exactly backported later on? Thanks.

@thedtripp thedtripp force-pushed the feature/installShellcheckBackport3.5 branch from 55afcff to 56de64d Compare June 27, 2024 04:39
@thedtripp
Copy link
Contributor Author

Hi @thedtripp, thanks for working on this. Can you reference commit 4f23883 and pull request #14872 in your commit message? So it's easier to identify what's exactly backported later on? Thanks.

Hey @ivanvc,
I just updated my commit message as requested.
Thanks!

@thedtripp
Copy link
Contributor Author

I see some changes have been added to this PR.
I have been rebasing and didn't expect others to be making commits here.
I think the additional changes should be made in a separate PR to keep each PR small and doing one thing.
I'm not really sure how to untangle the changes but I could submit a new PR if needed.

@ivanvc
Copy link
Member

ivanvc commented Jun 27, 2024 •
edited
Loading

I see some changes have been added to this PR.
I have been rebasing and didn't expect others to be making commits here.
I think the additional changes should be made in a separate PR to keep each PR small and doing one thing.
I'm not really sure how to untangle the changes but I could submit a new PR if needed.

Did you fetch the remote before rebasing? The changes are in unrelated files, so that may be the issue

@thedtripp
etcd 3.5: Install shellcheck if not installed.
31bce64 
Include conditional logic to install shellcheck with correct architecture.

This is based on commit 4f23883 and pull request etcd-io#14872.

Signed-off-by: D Tripp <[email protected]>
@thedtripp thedtripp force-pushed the feature/installShellcheckBackport3.5 branch from 56de64d to 31bce64 Compare June 27, 2024 06:03
@thedtripp
Copy link
Contributor Author

I see some changes have been added to this PR.
I have been rebasing and didn't expect others to be making commits here.
I think the additional changes should be made in a separate PR to keep each PR small and doing one thing.
I'm not really sure how to untangle the changes but I could submit a new PR if needed.

Did you fetch the remote before rebasing? The changes are in unrelated files, so that may be the issue

Looks like I had included the previous commit in my rebase. Totally my fault. I think I have fixed it now.

jmhbnz
jmhbnz approved these changes Jun 27, 2024
View reviewed changes
Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

LGTM - Thanks @thedtripp

ivanvc
ivanvc approved these changes Jun 27, 2024
View reviewed changes
Copy link
Member

@ivanvc ivanvc left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@jmhbnz jmhbnz merged commit 8fde09b into etcd-io:release-3.5 Jun 28, 2024
26 checks passed
@thedtripp thedtripp deleted the feature/installShellcheckBackport3.5 branch June 28, 2024 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ivanvc ivanvc ivanvc approved these changes

@jmhbnz jmhbnz jmhbnz approved these changes

Assignees
No one assigned
Labels
ok-to-test size/S
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thedtripp @k8s-ci-robot @jmhbnz @ivanvc