Skip to content

OSDOCS-16997-installation-config-parameters-gcp# CQA - #114139

Merged
sslocket merged 1 commit into
openshift:mainfrom
sslocket:OSDOCS-16997-installation-config-parameters-gcp
Sep 2, 2026
Merged

OSDOCS-16997-installation-config-parameters-gcp# CQA#114139
sslocket merged 1 commit into
openshift:mainfrom
sslocket:OSDOCS-16997-installation-config-parameters-gcp

Conversation

@sslocket

@sslocket sslocket commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Version(s): 4.20+

https://redhat.atlassian.net/browse/OSDOCS-16997

Link to docs preview:

Installation configuration parameters for GCP

QE review: (Not needed for these superficial CQA changes)

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 25, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented Jun 25, 2026

Copy link
Copy Markdown

🤖 Wed Sep 02 11:29:23 - Prow CI generated the docs preview:
https://114139--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@sslocket
sslocket force-pushed the OSDOCS-16997-installation-config-parameters-gcp branch from 7740be5 to b8c15f5 Compare September 2, 2026 11:20
@openshift-ci

openshift-ci Bot commented Sep 2, 2026

Copy link
Copy Markdown

@sslocket: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@sslocket
sslocket merged commit 2b8f3c1 into openshift:main Sep 2, 2026
2 checks passed
@sslocket

sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@sslocket

sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@openshift-cherrypick-robot

Copy link
Copy Markdown

@sslocket: #114139 failed to apply on top of branch "enterprise-4.20":

Applying: OSDOCS-16997-installation-config-parameters-gcp: CQA
Using index info to reconstruct a base tree...
M	modules/installation-configuration-parameters.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.adoc
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-16997-installation-config-parameters-gcp: CQA

Details

In response to this:

/cherrypick enterprise-4.20

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.

@sslocket

sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@openshift-cherrypick-robot

Copy link
Copy Markdown

@sslocket: #114139 failed to apply on top of branch "enterprise-4.21":

Applying: OSDOCS-16997-installation-config-parameters-gcp: CQA
Using index info to reconstruct a base tree...
M	modules/installation-configuration-parameters.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.adoc
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-16997-installation-config-parameters-gcp: CQA

Details

In response to this:

/cherrypick enterprise-4.21

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@sslocket: new pull request created: #119193

Details

In response to this:

/cherrypick enterprise-4.22

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.

@sslocket

sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@sslocket: new pull request created: #119194

Details

In response to this:

/cherrypick enterprise-5.0

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.

@sslocket

sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

Copy link
Copy Markdown

@sslocket: #114139 failed to apply on top of branch "enterprise-4.20":

Applying: OSDOCS-16997-installation-config-parameters-gcp: CQA
Using index info to reconstruct a base tree...
M	modules/installation-configuration-parameters.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.adoc
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-16997-installation-config-parameters-gcp: CQA

Details

In response to this:

/cherrypick enterprise-4.20

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.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants