CQA fixes for AWS STS by shdeshpa07 · Pull Request #108897 · openshift/openshift-docs

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.

shdeshpa07 · 2026-03-30T10:15:28Z

/cherrypick enterprise-4.22

shdeshpa07 · 2026-03-30T10:15:40Z

/cherrypick enterprise-4.21

shdeshpa07 · 2026-03-30T10:15:58Z

/cherrypick enterprise-4.20

shdeshpa07 · 2026-03-30T10:16:03Z

/cherrypick enterprise-4.19

shdeshpa07 · 2026-03-30T10:16:15Z

/cherrypick enterprise-4.18

shdeshpa07 · 2026-03-30T10:16:22Z

/cherrypick enterprise-4.17

shdeshpa07 · 2026-03-30T10:16:29Z

/cherrypick enterprise-4.16

openshift-cherrypick-robot · 2026-03-30T10:16:31Z

@shdeshpa07: new pull request created: #109192

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.

shdeshpa07 · 2026-03-30T10:16:37Z

/cherrypick enterprise-4.15

openshift-cherrypick-robot · 2026-03-30T10:16:38Z

@shdeshpa07: new pull request created: #109193

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.

shdeshpa07 · 2026-03-30T10:16:45Z

/cherrypick enterprise-4.14

openshift-cherrypick-robot · 2026-03-30T10:16:51Z

@shdeshpa07: new pull request created: #109194

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.

openshift-cherrypick-robot · 2026-03-30T10:16:54Z

@shdeshpa07: #108897 failed to apply on top of branch "enterprise-4.19":

Applying: CQA fixes for AWS STS
.git/rebase-apply/patch:79: trailing whitespace.
Install {oadp-first} on an {aws-short} {sts-short} cluster. AWS Security Token Service (AWS STS) is a global web service that provides short-term credentials for IAM or federated users. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
M	modules/installing-oadp-aws-sts.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in modules/installing-oadp-aws-sts.adoc
Auto-merging backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.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 CQA fixes for AWS STS

Details

In response to this:

/cherrypick enterprise-4.19

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 · 2026-03-30T10:17:04Z

@shdeshpa07: #108897 failed to apply on top of branch "enterprise-4.18":

Applying: CQA fixes for AWS STS
.git/rebase-apply/patch:79: trailing whitespace.
Install {oadp-first} on an {aws-short} {sts-short} cluster. AWS Security Token Service (AWS STS) is a global web service that provides short-term credentials for IAM or federated users. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
M	modules/installing-oadp-aws-sts.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in modules/installing-oadp-aws-sts.adoc
Auto-merging backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.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 CQA fixes for AWS STS

Details

In response to this:

/cherrypick enterprise-4.18

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 · 2026-03-30T10:17:10Z

@shdeshpa07: #108897 failed to apply on top of branch "enterprise-4.17":

Applying: CQA fixes for AWS STS
.git/rebase-apply/patch:79: trailing whitespace.
Install {oadp-first} on an {aws-short} {sts-short} cluster. AWS Security Token Service (AWS STS) is a global web service that provides short-term credentials for IAM or federated users. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
M	modules/installing-oadp-aws-sts.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in modules/installing-oadp-aws-sts.adoc
Auto-merging backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.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 CQA fixes for AWS STS

Details

In response to this:

/cherrypick enterprise-4.17

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 · 2026-03-30T10:17:17Z

@shdeshpa07: #108897 failed to apply on top of branch "enterprise-4.16":

Applying: CQA fixes for AWS STS
.git/rebase-apply/patch:79: trailing whitespace.
Install {oadp-first} on an {aws-short} {sts-short} cluster. AWS Security Token Service (AWS STS) is a global web service that provides short-term credentials for IAM or federated users. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
M	modules/installing-oadp-aws-sts.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in modules/installing-oadp-aws-sts.adoc
Auto-merging backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.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 CQA fixes for AWS STS

Details

In response to this:

/cherrypick enterprise-4.16

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 · 2026-03-30T10:17:23Z

@shdeshpa07: #108897 failed to apply on top of branch "enterprise-4.15":

Applying: CQA fixes for AWS STS
.git/rebase-apply/patch:79: trailing whitespace.
Install {oadp-first} on an {aws-short} {sts-short} cluster. AWS Security Token Service (AWS STS) is a global web service that provides short-term credentials for IAM or federated users. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
M	modules/installing-oadp-aws-sts.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in modules/installing-oadp-aws-sts.adoc
Auto-merging backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.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 CQA fixes for AWS STS

Details

In response to this:

/cherrypick enterprise-4.15

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 · 2026-03-30T10:17:31Z

@shdeshpa07: #108897 failed to apply on top of branch "enterprise-4.14":

Applying: CQA fixes for AWS STS
.git/rebase-apply/patch:79: trailing whitespace.
Install {oadp-first} on an {aws-short} {sts-short} cluster. AWS Security Token Service (AWS STS) is a global web service that provides short-term credentials for IAM or federated users. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
M	modules/installing-oadp-aws-sts.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in modules/installing-oadp-aws-sts.adoc
Auto-merging backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
CONFLICT (content): Merge conflict in backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.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 CQA fixes for AWS STS

Details

In response to this:

/cherrypick enterprise-4.14

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-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 24, 2026

shdeshpa07 added the OADP Label for all OADP PRs label Mar 25, 2026

vashirova approved these changes Mar 27, 2026

View reviewed changes

modules/performing-a-backup-oadp-aws-sts.adoc Outdated Show resolved Hide resolved

CQA fixes for AWS STS

1ae8f33

Signed-off-by: Shruti Deshpande <shdeshpa@redhat.com>

shdeshpa07 force-pushed the OADP-7336-cqa-aws-sts branch from 4a48459 to 1ae8f33 Compare March 30, 2026 09:56

shdeshpa07 added branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 branch/enterprise-4.22 branch/enterprise-4.17 labels Mar 30, 2026

shdeshpa07 added this to the Continuous Release milestone Mar 30, 2026

shdeshpa07 merged commit 4f5eb91 into openshift:main Mar 30, 2026
2 checks passed

openshift-cherrypick-robot mentioned this pull request Mar 30, 2026

[enterprise-4.22] CQA fixes for AWS STS #109192

Merged

openshift-cherrypick-robot mentioned this pull request Mar 30, 2026

[enterprise-4.21] CQA fixes for AWS STS #109193

Merged

openshift-cherrypick-robot mentioned this pull request Mar 30, 2026

[enterprise-4.20] CQA fixes for AWS STS #109194

Merged

This was referenced Mar 30, 2026

CQA fixes for AWS STS #109196

Merged

CQA fixes for AWS STS #109212

Merged

CQA fixes for AWS STS #109213

Merged

CQA fixes for AWS STS #109223

Open

CQA fixes for AWS STS #109224

Open

CQA fixes for AWS STS #109225

Open

Conversation

shdeshpa07 commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Jira

Version

Preview

Uh oh!

ocpdocs-previewbot commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shdeshpa07 commented Mar 27, 2026

Uh oh!

vashirova left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

openshift-ci bot commented Mar 30, 2026

Uh oh!

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

shdeshpa07 commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

shdeshpa07 commented Mar 24, 2026 •

edited

Loading

ocpdocs-previewbot commented Mar 24, 2026 •

edited

Loading