search

crc-org / snc

Single Node Cluster creation scripts for OpenShift 4.x as used by CodeReady Containers
https://crc.dev
Apache License 2.0
100 stars 49 forks source link

microshift script related changes to update it to 4.16 #872

Closed praveenkumar closed 2 months ago

praveenkumar commented 3 months ago

/cherry-pick release-4.16

openshift-cherrypick-robot commented 3 months ago

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

In response to [this](https://github.com/crc-org/snc/pull/872#issuecomment-2039373036): >/cherry-pick release-4.16 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
praveenkumar commented 3 months ago

https://github.com/crc-org/snc/pull/872/commits/1a4dea8f8418db44ea4ff2ab84e376e6c33b87c7 is cherry-picked from the release-4.15 branch.

praveenkumar commented 2 months ago

Can you also cleanup the remaining non-doc 4.14/4.15 occurrences?

I did update some but following is still there.

This is still true for OKD bundle of SCOS.

snc-library.sh:48:            curl -L https://github.com/okd-project/okd/releases/download/4.14.0-0.okd-2024-01-06-084517/openshift-client-windows-4.14.0-0.okd-2024-01-06-084517.zip > openshift-clients/windows/oc.zip

4.15 is used here for example purpose.

$ git grep -n 4.15
README.md:3:**NOTE:** Please select the respective branch to create a bundle for a specific OpenShift release (ie. to create a 4.15.x OpenShift bundle, choose the release-4.15 branch)
openshift-ci[bot] commented 2 months ago

@praveenkumar: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-snc 1b122ed02084a993f21fd996f7e4d412a03a460a link true /test e2e-snc

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfergeau

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: - ~~[OWNERS](https://github.com/crc-org/snc/blob/master/OWNERS)~~ [cfergeau] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 2 months ago

@praveenkumar: #872 failed to apply on top of branch "release-4.16":

Applying: microshift: Update the version to 4.16 for master
Applying: microshift: Skip if rhocp repo for prerelease version
Applying: CI: Add `MICROSHIFT_PRERELEASE` env for bundle creation
Applying: Microshift: Add microshift-multus package
Using index info to reconstruct a base tree...
M   microshift.sh
Falling back to patching base and 3-way merge...
Auto-merging microshift.sh
CONFLICT (content): Merge conflict in microshift.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Microshift: Add microshift-multus package
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](https://github.com/crc-org/snc/pull/872#issuecomment-2039373036): >/cherry-pick release-4.16 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.