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.

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

[RHDEVDOCS-5040] Bump up image folder versions for pipelines 1.10 release #58250

Merged
merged 1 commit into from
Apr 14, 2023

Conversation

SNiemann15
Copy link
Contributor

@SNiemann15 SNiemann15 commented Apr 5, 2023

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 5, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 5, 2023

🤖 Updated build preview is available at:
https://58250--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/13452

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 5, 2023
@rupalibehera
Copy link

LGTM

Copy link

@ppitonak ppitonak left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Contributor

@shipsing shipsing left a comment

Choose a reason for hiding this comment

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

@shipsing
Copy link
Contributor

shipsing commented Apr 6, 2023

A generic question, if i look at the compatibility matrix here: http://dashboard.apps.cicd.ospqa.com/releases/componentmatrix/, i see the compatible OCP versions for pipelines 1.10 are 4.11, 4.12, 4.13. In the PR, do we need to change the version for cherry-picking to 4.11+, instead of 4.12+ ?

@rolfedh rolfedh merged commit 9c29ee6 into openshift:main Apr 14, 2023
1 check passed
@rolfedh
Copy link
Contributor

rolfedh commented Apr 14, 2023

/cherrypick enterprise-4.11

@rolfedh
Copy link
Contributor

rolfedh commented Apr 14, 2023

/cherrypick enterprise-4.12

@rolfedh
Copy link
Contributor

rolfedh commented Apr 14, 2023

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@rolfedh: #58250 failed to apply on top of branch "enterprise-4.11":

Applying: bump up folder versions for 1.10 release
Using index info to reconstruct a base tree...
M	modules/op-installing-pipelines-as-code-cli.adoc
M	modules/op-installing-tkn-on-linux.adoc
M	modules/op-installing-tkn-on-macos.adoc
M	modules/op-installing-tkn-on-windows.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/op-installing-tkn-on-windows.adoc
CONFLICT (content): Merge conflict in modules/op-installing-tkn-on-windows.adoc
Auto-merging modules/op-installing-tkn-on-macos.adoc
CONFLICT (content): Merge conflict in modules/op-installing-tkn-on-macos.adoc
Auto-merging modules/op-installing-tkn-on-linux.adoc
CONFLICT (content): Merge conflict in modules/op-installing-tkn-on-linux.adoc
Auto-merging modules/op-installing-pipelines-as-code-cli.adoc
CONFLICT (content): Merge conflict in modules/op-installing-pipelines-as-code-cli.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bump up folder versions for 1.10 release
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:

/cherrypick enterprise-4.11

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.

@openshift-cherrypick-robot

@rolfedh: new pull request created: #58726

In response to this:

/cherrypick enterprise-4.12

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.

@openshift-cherrypick-robot

@rolfedh: new pull request created: #58727

In response to this:

/cherrypick enterprise-4.13

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.

@rolfedh rolfedh added peer-review-done Signifies that the peer review team has reviewed this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs qe-approved Signifies that QE has signed off on this PR branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 labels Apr 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs peer-review-done Signifies that the peer review team has reviewed this PR qe-approved Signifies that QE has signed off on this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants