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

Fix wrong shell in release task #2466

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Fix wrong shell in release task #2466

merged 1 commit into from
Dec 19, 2024

Conversation

afrittoli
Copy link
Member

@afrittoli afrittoli commented Dec 18, 2024 •
edited
Loading

Changes

Fix various issues in the release task and pipeline after the migration to ghcr.io

/kind misc

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide for more details.

Release Notes

@tekton-robot tekton-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/misc Categorizes issue or PR as a miscellaneuous one. labels Dec 18, 2024
@tekton-robot tekton-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 18, 2024
@PuneetPunamiya
Copy link
Member

/approve

@tekton-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: PuneetPunamiya

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 18, 2024
@afrittoli
Copy link
Member Author

afrittoli commented Dec 18, 2024 •
edited
Loading

Thanks @PuneetPunamiya for the prompt review.
I'm running a test run on the cluster to see if everything else work.

@afrittoli afrittoli force-pushed the fix_wrong_shell_in_release branch from 943b6c2 to c4f862d Compare December 18, 2024 13:11
@tekton-robot tekton-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 18, 2024
@afrittoli afrittoli force-pushed the fix_wrong_shell_in_release branch from c4f862d to 1310a2e Compare December 18, 2024 13:28
@afrittoli
Fix wrong shell in release task
5060eed 
And make some files KUBE_DISTRO specific to avoid clash between
publish tasks running in parallel with different KUBE_DISTRO

Signed-off-by: Andrea Frittoli <[email protected]>
@afrittoli afrittoli force-pushed the fix_wrong_shell_in_release branch from 1310a2e to 5060eed Compare December 18, 2024 14:22
@afrittoli
Copy link
Member Author

/test pull-tekton-operator-build-tests

@afrittoli afrittoli mentioned this pull request Dec 18, 2024
Open
5 tasks
@jkhelil
Copy link
Member

jkhelil commented Dec 19, 2024

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2024
@tekton-robot tekton-robot merged commit a98ed25 into tektoncd:main Dec 19, 2024
8 checks passed
@jkhelil
Copy link
Member

jkhelil commented Jan 11, 2025

/cherry-pick release-v0.73.x
/cherry-pick release-v0.74.x

@tekton-robot
Copy link
Contributor

@jkhelil: #2466 failed to apply on top of branch "release-v0.73.x":

Applying: Fix wrong shell in release task
Using index info to reconstruct a base tree...
M	tekton/build-publish-images-manifests.yaml
M	tekton/operator-release-pipeline.yaml
Falling back to patching base and 3-way merge...
Auto-merging tekton/operator-release-pipeline.yaml
Auto-merging tekton/build-publish-images-manifests.yaml
CONFLICT (content): Merge conflict in tekton/build-publish-images-manifests.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix wrong shell in release task
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.73.x
/cherry-pick release-v0.74.x

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/test-infra repository.

@jkhelil
Copy link
Member

jkhelil commented Jan 13, 2025

/cherry-pick release-v0.73.x

@tekton-robot
Copy link
Contributor

@jkhelil: new pull request created: #2509

In response to this:

/cherry-pick release-v0.73.x

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/test-infra repository.

@tekton-robot tekton-robot mentioned this pull request Jan 13, 2025
Merged
@jkhelil
Copy link
Member

jkhelil commented Jan 23, 2025

/cherry-pick release-v0.74.x

@tekton-robot
Copy link
Contributor

@jkhelil: new pull request created: #2531

In response to this:

/cherry-pick release-v0.74.x

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/test-infra repository.

@tekton-robot tekton-robot mentioned this pull request Jan 23, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkhelil jkhelil Awaiting requested review from jkhelil

@PuneetPunamiya PuneetPunamiya Awaiting requested review from PuneetPunamiya

Assignees

@jkhelil jkhelil

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@afrittoli @PuneetPunamiya @tekton-robot @jkhelil