Skip to content

Conversation

rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Apr 10, 2021

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 10, 2021
@netlify
Copy link

netlify bot commented Apr 10, 2021

Deploy preview for osdocs ready!

Built with commit e6f5e68

https://deploy-preview-31470--osdocs.netlify.app

@rolfedh
Copy link
Contributor Author

rolfedh commented Apr 10, 2021

@kabirbhartiRH Please review and approve this PR with /lgtm. Thank you.
This PR simply moves the "Squash layers with docker builds" subtopic from here to here.

@kabirbhartiRH
Copy link

kabirbhartiRH commented Apr 11, 2021

LGTM @rolfedh

Thank you

@neal-timpe
Copy link
Contributor

LGTM

Copy link
Contributor

@gabemontero gabemontero left a comment

Choose a reason for hiding this comment

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

One suggestion @rolfedh ... hopefully I have explained it sufficiently. If not, let me know and we can discuss.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 13, 2021
Copy link
Contributor

@gabemontero gabemontero left a comment

Choose a reason for hiding this comment

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

LGTM

@JStickler JStickler merged commit d92dadf into openshift:master Apr 14, 2021
@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot

@JStickler: #31470 failed to apply on top of branch "enterprise-4.5":

Applying: RHDEVDOCS-2778 Edit suggested in file builds/running-entitled-builds.adoc
Using index info to reconstruct a base tree...
A	cicd/builds/build-strategies.adoc
A	cicd/builds/running-entitled-builds.adoc
Falling back to patching base and 3-way merge...
Auto-merging builds/running-entitled-builds.adoc
CONFLICT (content): Merge conflict in builds/running-entitled-builds.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 RHDEVDOCS-2778 Edit suggested in file builds/running-entitled-builds.adoc
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 enterprise-4.5

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.

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.6

@openshift-cherrypick-robot

@JStickler: #31470 failed to apply on top of branch "enterprise-4.6":

Applying: RHDEVDOCS-2778 Edit suggested in file builds/running-entitled-builds.adoc
Using index info to reconstruct a base tree...
A	cicd/builds/build-strategies.adoc
A	cicd/builds/running-entitled-builds.adoc
Falling back to patching base and 3-way merge...
Auto-merging builds/running-entitled-builds.adoc
CONFLICT (content): Merge conflict in builds/running-entitled-builds.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 RHDEVDOCS-2778 Edit suggested in file builds/running-entitled-builds.adoc
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 enterprise-4.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/test-infra repository.

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.7

@JStickler
Copy link
Contributor

/cherry-pick enterprise-4.8

@openshift-cherrypick-robot

@JStickler: new pull request created: #31573

In response to this:

/cherry-pick enterprise-4.7

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

@JStickler: new pull request created: #31574

In response to this:

/cherry-pick enterprise-4.8

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants