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

images: use /usr/bin/env bash instead of /bin/bash #25558

Merged
merged 2 commits into from May 26, 2023
Merged

images: use /usr/bin/env bash instead of /bin/bash #25558

merged 2 commits into from May 26, 2023

Conversation

MrFreezeex
Copy link
Member

Please ensure your pull request adheres to the following guidelines:

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Are you a user of Cilium? Please add yourself to the Users doc
  • Thanks for contributing!

Fixes: #issue-number

use /usr/bin/env bash instead of /bin/bash in images dir

@MrFreezeex MrFreezeex requested review from a team as code owners May 19, 2023 14:40
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 19, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label May 19, 2023
@gandro
Copy link
Member

gandro commented May 22, 2023 •
edited

Approved the image builder workflow (needed to rebuild runtime/builder base images required for changes to images/). Once it passed, CI should re-run

Docs https://docs.cilium.io/en/v1.13/contributing/development/images/#update-cilim-builder-runtime-images

@MrFreezeex
images: use /usr/bin/env bash instead of /bin/bash
312ebe7 
This commit switch most usage of "/bin/bash" to "/usr/bin/env bash". This
allows to conform to the PATH env variable when invoking bash which is
especially important on distros/installs in which bash is NOT installed
in /bin/bash.

This is a followup commit after PR
cilium#24948 / commit 2c367de
that specifically targets shebang in images folder.

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>
@MrFreezeex
images: regenerate builder and runtime image
2ce3e1b 
Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>
@MrFreezeex MrFreezeex temporarily deployed to release-base-images May 22, 2023 12:45 — with GitHub Actions Inactive
@MrFreezeex
Copy link
Member Author

MrFreezeex commented May 22, 2023 •
edited

Hmm I am not sure what I did wrong but last time it didn't generate sha256 for some reasons and the build/push job was not happy about that... Now it should be fine hopefully, could you reapprove the build job please @gandro 🙈 🙏

@nbusseneau nbusseneau added the release-note/misc This PR makes changes that have no direct user impact. label May 23, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 23, 2023
@nbusseneau
Copy link
Member

/test

@MrFreezeex
Copy link
Member Author

Hmm should I rebase for the travis test that timed out and the other tests not launching?

@gandro
Copy link
Member

gandro commented May 24, 2023 •
edited

We did have a recent Jenkins outage, the failing /test likely has a different cause. Let's try again

I'll also restart Travis manually. Previous run (timeout) https://github.com/cilium/cilium/pull/25558/checks?check_run_id=13659112030

@gandro
Copy link
Member

gandro commented May 24, 2023 •
edited by maintainer-s-little-helper bot

/test

Job 'Cilium-PR-K8s-1.26-kernel-net-next' failed:

Click to show.

Test Name

K8sDatapathConfig High-scale IPcache Test ingress policy enforcement

Failure Output

FAIL: Expected command: kubectl exec -n kube-system cilium-jbk6p -- bpftool map update pinned /sys/fs/bpf/tc/globals/cilium_world_cidrs4 key 0 0 0 0 0 0 0 0 value 1

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.26-kernel-net-next/124/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.26-kernel-net-next so I can create one.

Then please upload the Jenkins artifacts to that issue.

@nbusseneau
Copy link
Member

The net-next failure is #25605 and not caused by this PR.

@gandro
Copy link
Member

gandro commented May 25, 2023 •
edited

Travis is hitting #25272 which is also currently a known issue.

Edit: Unfortunately I cannot restart it. But since the images/ are not used in Travis, it's likely also not relevant.

@gandro
Copy link
Member

gandro commented May 25, 2023

Relevant CI passed (or has known flakes) and the image build (which executes the script here) was successful in the critical phase: https://github.com/cilium/cilium/actions/runs/5025428977/jobs/9012381931

The "Push change to PR" stage failed because the source branch here is on a fork. @MrFreezeex manually pushed the changes to the PR in commit 2ce3e1b - which looks identical to what CI was pushing. This is also partially confimred by the follow-up run, which is green: https://github.com/cilium/cilium/actions/runs/5045936115/jobs/9050828649

I'm marking this ready to merge.

@gandro gandro added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 25, 2023
@squeed squeed merged commit 0267091 into cilium:main May 26, 2023
58 of 60 checks passed
@MrFreezeex MrFreezeex deleted the images-bash branch May 26, 2023 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@nebril nebril nebril approved these changes

@nbusseneau nbusseneau nbusseneau approved these changes

Assignees
No one assigned
Labels
kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@MrFreezeex @gandro @nbusseneau @nebril @squeed