Skip to content

chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251)#152

Merged
openshift-merge-bot[bot] merged 2 commits intomainfrom
6668-7251
May 12, 2025
Merged

chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251)#152
openshift-merge-bot[bot] merged 2 commits intomainfrom
6668-7251

Conversation

@nickboldt
Copy link
Copy Markdown
Member

What does this PR do?

chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251)

Signed-off-by: RHDH Build (rhdh-bot) rhdh-bot@redhat.com

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

N/A (or see commit message above for issue number)

How to test this PR?

N/A

PR Checklist

As the author of this Pull Request I made sure that:

  • Code produced is complete
  • Code builds without errors
  • Tests are covering the bugfix
  • Relevant user documentation updated
  • Relevant contributing documentation updated

Reviewers

Reviewers, please comment how you tested the PR when approving it.

…so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251)

Signed-off-by: RHDH Build (rhdh-bot) <rhdh-bot@redhat.com>
@openshift-ci openshift-ci Bot requested review from davidfestal and gazarenkov May 9, 2025 17:11
@nickboldt nickboldt requested review from Fortune-Ndlovu, kadel and rm3l and removed request for davidfestal and gazarenkov May 9, 2025 17:11
@nickboldt nickboldt changed the title chore: generate repo and index files from... chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251) May 9, 2025
@nickboldt
Copy link
Copy Markdown
Member Author

/cherry-pick release-1.6

@openshift-cherrypick-robot
Copy link
Copy Markdown

@nickboldt: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.6

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.

Comment thread .rhdh/scripts/install.sh
@openshift-ci openshift-ci Bot removed the lgtm label May 12, 2025
@nickboldt nickboldt requested a review from rm3l May 12, 2025 18:53
@nickboldt nickboldt disabled auto-merge May 12, 2025 18:53
@sonarqubecloud
Copy link
Copy Markdown

Copy link
Copy Markdown
Member

@rm3l rm3l left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label May 12, 2025
@openshift-merge-bot openshift-merge-bot Bot merged commit 5d78cca into main May 12, 2025
8 checks passed
@openshift-merge-bot openshift-merge-bot Bot deleted the 6668-7251 branch May 12, 2025 19:24
@openshift-cherrypick-robot
Copy link
Copy Markdown

@nickboldt: #152 failed to apply on top of branch "release-1.6":

Applying: chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251)
Using index info to reconstruct a base tree...
A	.rhdh/scripts/install.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .rhdh/scripts/install.sh deleted in HEAD and modified in chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251). Version chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251) of .rhdh/scripts/install.sh left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore: generate repo and index files from the chart we're installing so we can also install a chart repo (for CI builds) (RHIDP-6668, RHIDP-7251)

Details

In response to this:

/cherry-pick release-1.6

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.

@nickboldt
Copy link
Copy Markdown
Member Author

See manual pick at #158 for 1.6 branch

cc: @Omar-AlJaljuli @rm3l

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants